Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 20910)
+++ 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 "حرّر محطة"