Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 22063)
+++ applications/editors/josm/i18n/po/ar.po	(revision 22209)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 17:00+0200\n"
-"PO-Revision-Date: 2010-06-23 22:19+0000\n"
+"POT-Creation-Date: 2010-07-06 17:43+0200\n"
+"PO-Revision-Date: 2010-06-28 15:33+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-06-28 14:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -28,5 +28,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 #: build/specialmessages.java:42
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -238,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -244,6 +244,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -329,8 +329,7 @@
 msgstr "لا يوجد طبقات هدف"
 
-#. modal
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35
 msgid "Add Node..."
 msgstr "أضف عقدة..."
@@ -648,5 +647,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
@@ -1027,5 +1026,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1034,5 +1033,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1169,4 +1168,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34
 msgid "Move Node..."
 msgstr ""
@@ -1440,6 +1440,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1656,6 +1656,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
@@ -2272,5 +2270,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2502,10 +2500,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid "Search..."
 msgstr "بحث..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search for objects."
 msgstr "بحث عن أغراض."
@@ -2513,65 +2511,65 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Please enter a search string."
 msgstr "الرجاء إدخال مصطلحات البحث."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
 msgid "Enter the search expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "replace selection"
 msgstr "إستبدل الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "add to selection"
 msgstr "أضف إلى اخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "remove from selection"
 msgstr "أحذف من الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "case sensitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
 msgid "all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
 msgid "Also include incomplete and deleted objects in search."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
 msgid "regular expression"
 msgstr "عبارة منتظمة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2579,38 +2577,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<u>Special targets:</u>"
 msgstr "<u>الأهداف المميزة:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>النوع:</b> - نوع الغرض (<b>عقدة</b>, <b>طريق</b>, <b>علاقة</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>المستخدم:</b>... - كلّ الأغراض اللتي قام المستخدم بتغييرها"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2618,5 +2616,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2624,5 +2622,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2630,5 +2628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2636,9 +2634,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>role:</b>... - object with given role in a relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2646,39 +2644,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>مغيير</b> - كلّ الأغراض المغييرة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>المختارة</b> - كلّ الأغراض المختارة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>غير المكتملة</b> - كلّ الأغراض غير المكتملة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>غير المسمات</b> - كلّ الأغراض غير المسمات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "إستعمل <b>|</b> أو <b>أو</b> للدمج بالأو المنطقي"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2686,12 +2684,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2700,38 +2698,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "إبحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Start Search"
 msgstr "إبدء البحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
+#, java-format
+msgid ""
+"Search expression is not valid: \n"
+"\n"
+" {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+#, fuzzy
+msgid "Invalid search expression"
+msgstr "عبارة منتظمة"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "لم أجد شيء مطابق لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 #, java-format
 msgid "Found {0} matches"
@@ -2739,5 +2750,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457
 msgctxt "search"
 msgid "CS"
@@ -2745,5 +2756,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458
 msgctxt "search"
 msgid "CI"
@@ -2751,5 +2762,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460
 msgctxt "search"
 msgid "RX"
@@ -2757,5 +2768,5 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462
 msgctxt "search"
 msgid "A"
@@ -2876,8 +2887,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
@@ -3016,5 +3027,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
 #, java-format
@@ -3138,11 +3149,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
 msgid "Purged {0} object"
@@ -3151,5 +3162,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
 msgid ""
@@ -3158,5 +3169,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3194,5 +3205,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65
 #, java-format
 msgid "Undelete {0} primitive"
@@ -3501,6 +3512,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3510,10 +3521,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
 #, java-format
 msgid "Missing merge target for object with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3521,5 +3532,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3528,5 +3539,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3534,78 +3545,4 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
-
-#. translators notes must be in front
-#. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358
-msgctxt "filter"
-msgid "E"
-msgstr ""
-
-#. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359
-msgctxt "filter"
-msgid "H"
-msgstr ""
-
-#. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360
-msgctxt "filter"
-msgid "Text"
-msgstr ""
-
-#. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361
-msgctxt "filter"
-msgid "I"
-msgstr ""
-
-#. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362
-msgctxt "filter"
-msgid "M"
-msgstr ""
-
-#. translators notes must be in front
-#. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424
-msgctxt "filter"
-msgid "R"
-msgstr ""
-
-#. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425
-msgctxt "filter"
-msgid "A"
-msgstr ""
-
-#. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426
-msgctxt "filter"
-msgid "D"
-msgstr ""
-
-#. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427
-msgctxt "filter"
-msgid "F"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457
-msgid "<h2>Filter active</h2>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463
-#, java-format
-msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471
-#, java-format
-msgid "<b>{0}</b> objects disabled"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474
-msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
@@ -3749,5 +3686,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
 msgid "background"
 msgstr "الخلفية"
@@ -3917,5 +3854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -3936,7 +3873,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
 #, java-format
 msgid "{0} node"
@@ -4007,7 +3944,7 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4325
+#: build/trans_style.java:4349
 msgid "building"
 msgstr ""
@@ -4096,5 +4033,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
@@ -4311,5 +4248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4608,12 +4545,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
@@ -4624,6 +4561,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4631,6 +4568,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
@@ -4638,9 +4575,9 @@
 msgstr "الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 #, java-format
 msgid "Tags({0} conflict)"
@@ -4649,5 +4586,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 #, java-format
 msgid "{0} pending tag conflict to be resolved"
@@ -4656,26 +4593,26 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+msgid "Nodes(resolved)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
-msgid "Nodes(resolved)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+msgid "Nodes(with conflicts)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
+msgid "Members(resolved)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
-msgid "Members(resolved)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4683,25 +4620,25 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
+msgid "Members(with conflicts)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
-msgid "Members(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
 msgid "No pending property conflicts"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
+msgid "Properties(with conflicts)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
-msgid "Properties(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284
 msgid "Conflict Resolution"
 msgstr ""
@@ -4747,5 +4684,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81
 msgid "My version"
 msgstr ""
@@ -4756,5 +4693,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
 msgid "Merged version"
@@ -4768,5 +4705,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
 msgid "Their version"
 msgstr ""
@@ -4835,5 +4772,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
 #: build/specialmessages.java:64
 msgid "Up"
@@ -4845,5 +4782,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Down"
 msgstr ""
@@ -4942,60 +4879,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
-#, java-format
-msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
-msgid "Communication with server failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
-msgid "Yes, undelete them too"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
-msgid "No, cancel operation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515
-#, java-format
-msgid ""
-"There is {0} additional node used by way {1}<br>which is deleted on the "
-"server.<br><br>Do you want to undelete this node too?"
-msgid_plural ""
-"There are {0} additional nodes used by way {1}<br>which are deleted on the "
-"server.<br><br>Do you want to undelete these nodes too?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
-msgid "Undelete additional nodes?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549
-#, java-format
-msgid ""
-"There is {0} additional primitive referred to by relation {1}<br>which is "
-"deleted on the server.<br><br>Do you want to undelete this too?"
-msgid_plural ""
-"There are {0} additional primitives referred to by relation {1}<br>which are "
-"deleted on the server.<br><br>Do you want to undelete these too?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
-msgid "Undelete dependent primitives?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -5003,123 +4889,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
-msgid "Visible State:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
 msgid "Referenced by:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
 msgid "deleted"
 msgstr "تم حذفه"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311
 msgid "not deleted"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
-msgid "visible (on the server)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
-msgid "not visible (on the server)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
-msgid "Keep a clone of the local version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Physically delete from local dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475
 msgid "Undecide conflict between deleted state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
-msgid "Keep my visible state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
-msgid "Yes, reset the id"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, java-format
-msgid ""
-"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
-"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-"you agree?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
-msgid "Reset id to 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
-msgid "Keep their visible state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
-msgid "Yes, purge it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
-#, java-format
-msgid ""
-"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
-"dataset.<br>Do you agree?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
-msgid "Remove from dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
-msgid "Undecide conflict between visible state"
 msgstr ""
 
@@ -5267,5 +5088,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "all"
 msgstr "الكلّ"
@@ -5345,7 +5166,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
 #, java-format
 msgid "{0} way"
@@ -5359,6 +5180,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} relation"
@@ -5544,5 +5365,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5598,25 +5419,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191
 msgid "Cancel conflict resolution and close the dialog"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
+msgid "Apply resolved conflicts and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
-msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
 msgid "Apply Resolution"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237
+msgid "Close anyway"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
-msgid "Close anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
 msgid "Continue resolving"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240
 #, java-format
 msgid ""
@@ -5628,22 +5449,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248
 msgid "Conflict not resolved completely"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281
 msgid "Resolve conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5656,43 +5477,121 @@
 msgstr "أضِف"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Move filter down."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
+msgid "Hide elements"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
-msgid "Enable filter"
+msgid "Inverse filter"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
-msgid "Hide elements"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
-msgid "Inverse filter"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
+msgid "Error in filter"
+msgstr ""
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+msgctxt "filter"
+msgid "H"
+msgstr ""
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+msgctxt "filter"
+msgid "Text"
+msgstr ""
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+msgctxt "filter"
+msgid "I"
+msgstr ""
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+msgctxt "filter"
+msgid "M"
+msgstr ""
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+msgctxt "filter"
+msgid "R"
+msgstr ""
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+msgctxt "filter"
+msgid "A"
+msgstr ""
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+msgctxt "filter"
+msgid "D"
+msgstr ""
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+msgctxt "filter"
+msgid "F"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+msgid "<h2>Filter active</h2>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#, java-format
+msgid "<p><b>{0}</b> objects hidden"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#, java-format
+msgid "<b>{0}</b> objects disabled"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
@@ -5735,37 +5634,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Enter the coordinates for the new node."
 msgstr "أدخل الأحداثيات للعقدة الجديدة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Use decimal degrees."
 msgstr "إستعمل الدرجات العشرية."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "الرجاء إدخال خط طول صالح  من ضمن المجال  -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
 msgid "Please enter a latitude in the range -90..90"
 msgstr "الرجاء إدخال خط طول  من ضمن المجال  -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "الرجاء إدخال خط عرض صالح  من ضمن المجال -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
 msgid "Please enter a longitude in the range -180..180"
 msgstr "الرجاء إدخال خط عرض  من ضمن المجال -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
 msgid "Close the dialog and create a new node"
 msgstr "أغلق الحوار و أنشئ عقدة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
 msgid "Close the dialog, do not create a new node"
 msgstr "أغلق الحوار، لا تأنشئ عقدة جديدة"
@@ -5825,5 +5724,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3206
 msgid "Relations"
 msgstr "العلاقات"
@@ -5871,10 +5770,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848
 msgid "Download incomplete members"
 msgstr ""
@@ -5938,14 +5837,14 @@
 msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
 #, java-format
 msgid "Selection: {0}"
 msgstr "الخيار: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
 msgid "Get detailed information on the internal state of the objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884
 msgid "Inspect"
 msgstr ""
@@ -6646,8 +6545,16 @@
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
 #. <key key="sport" value="soccer" />
-#. item "Sport (Ball)/Football" label "Edit Football"
-#. <key key="sport" value="football" />
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
 #. <key key="sport" value="australian_football" />
+#. item "Sport (Ball)/American Football" label "Edit American Football"
+#. <key key="sport" value="american_football" />
+#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#. <key key="sport" value="canadian_football" />
+#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#. <key key="sport" value="gaelic_football" />
+#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#. <key key="sport" value="rugby_league" />
+#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#. <key key="sport" value="rugby_union" />
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
 #. <key key="sport" value="baseball" />
@@ -6672,6 +6579,4 @@
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
 #. <key key="sport" value="racquet" />
-#. item "Sport (Ball)/Rugby" label "Edit Rugby"
-#. <key key="sport" value="rugby" />
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
 #. <key key="sport" value="table_tennis" />
@@ -7054,69 +6959,70 @@
 #: build/trans_presets.java:2139 build/trans_presets.java:2145
 #: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2177
-#: build/trans_presets.java:2183 build/trans_presets.java:2189
-#: build/trans_presets.java:2196 build/trans_presets.java:2203
-#: build/trans_presets.java:2211 build/trans_presets.java:2218
-#: build/trans_presets.java:2224 build/trans_presets.java:2231
-#: build/trans_presets.java:2237 build/trans_presets.java:2243
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2264 build/trans_presets.java:2271
-#: build/trans_presets.java:2278 build/trans_presets.java:2286
-#: build/trans_presets.java:2318 build/trans_presets.java:2323
-#: build/trans_presets.java:2333 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2402
-#: build/trans_presets.java:2409 build/trans_presets.java:2510
-#: build/trans_presets.java:2517 build/trans_presets.java:2538
-#: build/trans_presets.java:2546 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2564
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2597 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2163 build/trans_presets.java:2169
+#: build/trans_presets.java:2175 build/trans_presets.java:2181
+#: build/trans_presets.java:2195 build/trans_presets.java:2201
+#: build/trans_presets.java:2207 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2242
+#: build/trans_presets.java:2249 build/trans_presets.java:2255
+#: build/trans_presets.java:2261 build/trans_presets.java:2267
+#: build/trans_presets.java:2275 build/trans_presets.java:2282
+#: build/trans_presets.java:2289 build/trans_presets.java:2296
+#: build/trans_presets.java:2304 build/trans_presets.java:2336
+#: build/trans_presets.java:2341 build/trans_presets.java:2351
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2420 build/trans_presets.java:2427
+#: build/trans_presets.java:2528 build/trans_presets.java:2535
+#: build/trans_presets.java:2556 build/trans_presets.java:2564
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
 #: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2654
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2672 build/trans_presets.java:2679
 #: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2705
-#: build/trans_presets.java:2712 build/trans_presets.java:2719
-#: build/trans_presets.java:2725 build/trans_presets.java:2731
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2801
-#: build/trans_presets.java:2821 build/trans_presets.java:2832
-#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2698 build/trans_presets.java:2704
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2723 build/trans_presets.java:2730
+#: build/trans_presets.java:2737 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2774
+#: build/trans_presets.java:2783 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2812
+#: build/trans_presets.java:2819 build/trans_presets.java:2839
 #: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2877 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2897
-#: build/trans_presets.java:2904 build/trans_presets.java:2911
-#: build/trans_presets.java:2918 build/trans_presets.java:2924
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2953
-#: build/trans_presets.java:2959 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2980
-#: build/trans_presets.java:2990 build/trans_presets.java:2999
-#: build/trans_presets.java:3005 build/trans_presets.java:3011
-#: build/trans_presets.java:3016 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3043 build/trans_presets.java:3049
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2881
+#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:2901 build/trans_presets.java:2907
+#: build/trans_presets.java:2915 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2965
+#: build/trans_presets.java:2971 build/trans_presets.java:2977
+#: build/trans_presets.java:2983 build/trans_presets.java:2989
+#: build/trans_presets.java:2998 build/trans_presets.java:3008
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3029 build/trans_presets.java:3034
+#: build/trans_presets.java:3040 build/trans_presets.java:3046
 #: build/trans_presets.java:3055 build/trans_presets.java:3061
 #: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
 #: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3105 build/trans_presets.java:3111
-#: build/trans_presets.java:3120 build/trans_presets.java:3128
-#: build/trans_presets.java:3134 build/trans_presets.java:3140
-#: build/trans_presets.java:3147 build/trans_presets.java:3153
-#: build/trans_presets.java:3160 build/trans_presets.java:3166
-#: build/trans_presets.java:3172 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3196
-#: build/trans_presets.java:3210 build/trans_presets.java:3229
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3104 build/trans_presets.java:3109
+#: build/trans_presets.java:3116 build/trans_presets.java:3123
+#: build/trans_presets.java:3129 build/trans_presets.java:3138
+#: build/trans_presets.java:3146 build/trans_presets.java:3152
+#: build/trans_presets.java:3158 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3178
+#: build/trans_presets.java:3184 build/trans_presets.java:3190
+#: build/trans_presets.java:3196 build/trans_presets.java:3202
+#: build/trans_presets.java:3214 build/trans_presets.java:3228
+#: build/trans_presets.java:3247 build/trans_presets.java:3261
 msgid "Name"
 msgstr "الإسم"
@@ -7694,5 +7600,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
 #, java-format
@@ -8329,8 +8235,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2358 build/trans_presets.java:2392
-#: build/trans_presets.java:2401 build/trans_presets.java:2427
-#: build/trans_presets.java:2981 build/trans_presets.java:2991
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2376 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2445
+#: build/trans_presets.java:2999 build/trans_presets.java:3009
+#: build/trans_presets.java:3018
 msgid "Type"
 msgstr "النوع"
@@ -8359,6 +8265,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2501
-#: build/trans_presets.java:2502 build/trans_presets.java:2503
+#: build/trans_presets.java:1375 build/trans_presets.java:2519
+#: build/trans_presets.java:2520 build/trans_presets.java:2521
 msgid "unknown"
 msgstr "مجهول"
@@ -8679,5 +8585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
 msgid "Conflicts detected"
 msgstr ""
@@ -9195,4 +9101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
 msgid "Settings"
@@ -9692,5 +9599,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3264
 msgid "Description"
 msgstr ""
@@ -9741,5 +9648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
@@ -9812,23 +9719,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
 #, java-format
 msgid "Data Layer {0}"
 msgstr "طبقة المعطيات {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9837,34 +9744,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
-#, java-format
-msgid ""
-"{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
-"object<br>from the local dataset because it is deleted on the server."
-msgid_plural ""
-"{0} conflicts have been <strong>resolved automatically</strong> by purging "
-"{0} objects<br> from the local dataset because they are deleted on the "
-"server."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
-#, java-format
-msgid ""
-"{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-"Dialog and manually resolve it."
-msgid_plural ""
-"{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-"Dialog and manually resolve them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
 #, java-format
 msgid "{0} deleted"
@@ -9873,32 +9757,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} يتألف من:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
 msgid "Following problems found:"
 msgstr ""
@@ -12822,4 +12706,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
 #, java-format
@@ -14269,5 +14154,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14533,5 +14418,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:2306
+#: build/trans_presets.java:2324
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -14965,36 +14850,36 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 #, fuzzy
+msgid "on polygon"
+msgstr "متعدد الضلوع"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
 msgid "Add address"
-msgstr "العنوان"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63
-#, fuzzy
-msgid "Create house number and street name relation"
-msgstr "أنشئ علاقة جديدة"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
+msgid "Helping tool for tag address"
+msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2187
 msgid "Buildings"
 msgstr "مباني"
 
-#. item "Waypoints/Motorway Junction" text "Name"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72
-#: build/trans_presets.java:637
-msgid "Number"
-msgstr "الرقم"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+msgid "Next no"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
 msgid "Enter addresses"
-msgstr "عناوين"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
@@ -15148,10 +15033,14 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Select first WMS layer in list."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
+msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
 msgstr ""
 
@@ -15206,7 +15095,7 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2358 build/trans_style.java:1018
+#: build/trans_presets.java:2376 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3525
@@ -15215,13 +15104,13 @@
 msgstr "الماء"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 msgid "symbol"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 msgid "parcel"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid "parcel number"
 msgstr ""
@@ -15269,32 +15158,32 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
-#: build/trans_style.java:4353 build/trans_style.java:4360
-#: build/trans_style.java:4367 build/trans_style.java:4374
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: build/trans_style.java:4377 build/trans_style.java:4384
+#: build/trans_style.java:4391 build/trans_style.java:4398
 msgid "address"
 msgstr "العنوان"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "locality"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 msgid "section"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
 msgid "commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "Enable automatic caching."
 msgstr "تمكين الإخباء التلقائي"
 
 #. disabled by default
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
 msgid "Max. cache size (in MB)"
 msgstr "حجم الخابية الأقصى (م. بايت)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -15306,18 +15195,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
 msgid "Source"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -15325,5 +15214,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -15331,130 +15220,134 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
 #. option to select the single grabbed image resolution
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Image resolution:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
 msgid "High resolution (1000x800)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
 msgid "Medium resolution (800x600)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163
 msgid "Low resolution (600x400)"
 msgstr ""
 
 #. option to select image zooming interpolation method
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Image filter interpolation:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
 msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182
 msgid "Bilinear (fast)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Bicubic (slow)"
 msgstr ""
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209
 msgid "Grab one image full screen"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
 #. WMS layers selection
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246
 msgid "Layers:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249
 msgid "See, rivers, swimming pools."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252
 msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255
 msgid "Symbols like cristian cross."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258
 msgid "Parcels."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261
 msgid "Parcels numbers, street names."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264
 msgid "Address, houses numbers."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267
 msgid "Locality, hamlet, place."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270
 msgid "Cadastral sections and subsections."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273
 msgid "Municipality administrative borders."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334
 msgid ""
 "Automatically selects the first WMS layer if multiple layers exist when "
 "grabbing."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
@@ -15755,5 +15648,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
 #, java-format
 msgid ""
@@ -15762,14 +15655,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
 msgid "Cache Format Error"
 msgstr "خطء في صيغة المعطيات"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -17027,4 +16920,23 @@
 msgstr ""
 
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
+msgid "Create Stops from GTFS ..."
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
+msgid "Create Stops from a GTFS file"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
+#, java-format
+msgid "IOException \"{0}\" occurred"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
+msgid "GTFS-Stops"
+msgstr ""
+
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
@@ -17065,9 +16977,4 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75
 msgid "Create Stops from a GPX file"
-msgstr ""
-
-#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
-#, java-format
-msgid "IOException \"{0}\" occurred"
 msgstr ""
 
@@ -18567,5 +18474,5 @@
 #. * Other messages
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110
 msgid "Other"
 msgstr ""
@@ -18752,5 +18659,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3207
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -19267,5 +19174,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4332
+#: build/trans_style.java:4356
 msgid "area"
 msgstr ""
@@ -19308,34 +19215,37 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
-#, fuzzy
 msgid "No tags"
-msgstr "الملاحظات"
-
-#. translation note: don't translate quoted words
+msgstr ""
+
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
+msgid "Unconnected nodes without physical tags"
+msgstr ""
+
+#. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104
-msgid "Unconnected nodes without physical tags"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76
 msgid "Has tag containing ''fixme'' or ''FIXME''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
 msgstr ""
@@ -19358,7 +19268,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
-#, fuzzy
 msgid "Untagged ways (commented)"
-msgstr "ادخل تعليقك"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
@@ -20269,7 +20178,6 @@
 #. Strings in JFileChooser
 #: build/specialmessages.java:52
-#, fuzzy
 msgid "Open selected file"
-msgstr "إفتح ملف."
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20551,7 +20459,14 @@
 msgstr ""
 
-#. File ../plugins/roadsigns/build.xml had no data
+#. Plugin RoadSigns
+#: build/trans_plugins.java:68
+msgid ""
+"Plugin for tagging of objects based on a selection of road signs. The dialog "
+"can be opened by clicking a small icon in the upper right corner of the "
+"properties window. Available country presets: Germany."
+msgstr ""
+
 #. Plugin routes
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:70
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -20560,10 +20475,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:72
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:74
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -20572,5 +20487,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:76
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -20579,15 +20494,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:78
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:80
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:82
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20597,10 +20512,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:84
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:86
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20609,5 +20524,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:88
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20616,5 +20531,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:90
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20623,10 +20538,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:92
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:94
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20635,5 +20550,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:96
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20643,5 +20558,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:98
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20650,15 +20565,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:100
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:102
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:104
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20667,5 +20582,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:106
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20798,5 +20713,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2411 build/trans_presets.java:3244
+#: build/trans_presets.java:2429 build/trans_presets.java:3262
 msgid "Reference"
 msgstr ""
@@ -21335,5 +21250,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2493
+#: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "metal"
 msgstr ""
@@ -21346,5 +21261,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2493
+#: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "wood"
 msgstr "غابة/حرش"
@@ -21649,8 +21564,8 @@
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
 #: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2450
-#: build/trans_presets.java:2451 build/trans_presets.java:2492
-#: build/trans_presets.java:2501 build/trans_presets.java:2502
-#: build/trans_presets.java:2503 build/trans_presets.java:2793
+#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:2469 build/trans_presets.java:2510
+#: build/trans_presets.java:2519 build/trans_presets.java:2520
+#: build/trans_presets.java:2521 build/trans_presets.java:2811
 msgid "yes"
 msgstr ""
@@ -21761,8 +21676,8 @@
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
 #: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2450 build/trans_presets.java:2451
-#: build/trans_presets.java:2492 build/trans_presets.java:2501
-#: build/trans_presets.java:2502 build/trans_presets.java:2503
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2468 build/trans_presets.java:2469
+#: build/trans_presets.java:2510 build/trans_presets.java:2519
+#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:2811
 msgid "no"
 msgstr ""
@@ -22068,5 +21983,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4404
+#: build/trans_style.java:4428
 msgid "service"
 msgstr ""
@@ -22186,5 +22101,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3242
+#: build/trans_presets.java:487 build/trans_presets.java:3260
 msgid "hiking"
 msgstr ""
@@ -22333,4 +22248,9 @@
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
+
+#. item "Waypoints/Motorway Junction" text "Name"
+#: build/trans_presets.java:637
+msgid "Number"
+msgstr "الرقم"
 
 #. item "Waypoints/Motorway Junction" text "Number"
@@ -22383,13 +22303,13 @@
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
 #: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2225
-#: build/trans_presets.java:2327 build/trans_presets.java:2357
-#: build/trans_presets.java:2410 build/trans_presets.java:2418
-#: build/trans_presets.java:2435 build/trans_presets.java:2448
-#: build/trans_presets.java:2457 build/trans_presets.java:2464
-#: build/trans_presets.java:2529 build/trans_presets.java:2539
-#: build/trans_presets.java:2740 build/trans_presets.java:2757
-#: build/trans_presets.java:2772 build/trans_presets.java:2811
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:1796 build/trans_presets.java:2243
+#: build/trans_presets.java:2345 build/trans_presets.java:2375
+#: build/trans_presets.java:2428 build/trans_presets.java:2436
+#: build/trans_presets.java:2453 build/trans_presets.java:2466
+#: build/trans_presets.java:2475 build/trans_presets.java:2482
+#: build/trans_presets.java:2547 build/trans_presets.java:2557
+#: build/trans_presets.java:2758 build/trans_presets.java:2775
+#: build/trans_presets.java:2790 build/trans_presets.java:2829
+#: build/trans_presets.java:3267
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -22657,6 +22577,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2939
+#: build/trans_presets.java:1770 build/trans_presets.java:2943
+#: build/trans_presets.java:2950 build/trans_presets.java:2957
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -23508,5 +23428,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2438
+#: build/trans_presets.java:1237 build/trans_presets.java:2456
 msgid "Voltage"
 msgstr "التوتر"
@@ -23877,24 +23797,24 @@
 #: build/trans_presets.java:1738 build/trans_presets.java:1835
 #: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2265
-#: build/trans_presets.java:2289 build/trans_presets.java:2530
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:1952 build/trans_presets.java:2283
+#: build/trans_presets.java:2307 build/trans_presets.java:2548
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: 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:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -23961,23 +23881,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: 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:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "24/7"
 msgstr ""
@@ -23991,23 +23911,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: 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:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -24021,23 +23941,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: 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:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24151,6 +24071,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2449
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:1797 build/trans_presets.java:2467
+#: build/trans_presets.java:2759
 msgid "Reference number"
 msgstr "الرقم المرجعي"
@@ -24166,5 +24086,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2359
+#: build/trans_presets.java:1368 build/trans_presets.java:2377
 msgid "underground"
 msgstr "تحت الأرض"
@@ -24178,5 +24098,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2450
+#: build/trans_presets.java:1798 build/trans_presets.java:2468
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
@@ -24352,5 +24272,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2451
+#: build/trans_presets.java:1471 build/trans_presets.java:2469
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -24388,5 +24308,5 @@
 #. <separator/>
 #: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2519
 msgid "Shelter"
 msgstr "ملجأ"
@@ -24394,5 +24314,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2489
+#: build/trans_presets.java:1495 build/trans_presets.java:2507
 msgid "Bench"
 msgstr ""
@@ -24511,5 +24431,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2393
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -25248,5 +25168,5 @@
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2722
+#: build/trans_presets.java:1904 build/trans_presets.java:2740
 msgid "Sports"
 msgstr ""
@@ -25321,5 +25241,53 @@
 #.
 #. <rule>
+#. <condition k="sport" v="soccer"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="australian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="american_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="canadian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gaelic_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_league"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_union"/>
 #. color sport
 #. <icon src="sport/football.png"/>
@@ -25433,12 +25401,4 @@
 #.
 #. <rule>
-#. <condition k="sport" v="football"/>
-#. color sport
-#. <icon src="sport/football.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="golf"/>
 #. color sport
@@ -25505,12 +25465,4 @@
 #.
 #. <rule>
-#. <condition k="sport" v="rugby"/>
-#. color sport
-#. <icon src="sport/football.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="skating"/>
 #. color sport
@@ -25524,12 +25476,4 @@
 #. color sport
 #. <icon src="sport/skateboard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="sport" v="soccer"/>
-#. color sport
-#. <icon src="sport/soccer.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25691,5 +25635,6 @@
 #: build/trans_style.java:4074 build/trans_style.java:4082
 #: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106
+#: build/trans_style.java:4106 build/trans_style.java:4114
+#: build/trans_style.java:4122 build/trans_style.java:4130
 msgid "sport"
 msgstr "الرياضة"
@@ -25716,4 +25661,10 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
+#, fuzzy
+msgid "american_football"
+msgstr "كرة القدم الأوسترالية"
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
@@ -25741,4 +25692,10 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
+#, fuzzy
+msgid "canadian_football"
+msgstr "كرة القدم الأوسترالية"
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "canoe"
 msgstr ""
@@ -25781,6 +25738,7 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-msgid "football"
-msgstr ""
+#, fuzzy
+msgid "gaelic_football"
+msgstr "كرة القدم الأوسترالية"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -25821,5 +25779,10 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-msgid "rugby"
+msgid "rugby_league"
+msgstr ""
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
+msgid "rugby_union"
 msgstr ""
 
@@ -25940,6 +25903,10 @@
 #. item "Sport/Shooting" text "Name"
 #. item "Sport (Ball)/Soccer" text "Name"
-#. item "Sport (Ball)/Football" text "Name"
 #. item "Sport (Ball)/Australian Football" text "Name"
+#. item "Sport (Ball)/American Football" text "Name"
+#. item "Sport (Ball)/Canadian Football" text "Name"
+#. item "Sport (Ball)/Gaelic Football" text "Name"
+#. item "Sport (Ball)/Rugby League" text "Name"
+#. item "Sport (Ball)/Rugby Union" text "Name"
 #. item "Sport (Ball)/Baseball" text "Name"
 #. item "Sport (Ball)/Basketball" text "Name"
@@ -25953,5 +25920,4 @@
 #. item "Sport (Ball)/Pelota" text "Name"
 #. item "Sport (Ball)/Racquet" text "Name"
-#. item "Sport (Ball)/Rugby" text "Name"
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
@@ -25973,4 +25939,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "type"
 msgstr "النوع"
@@ -25994,6 +25962,10 @@
 #. item "Sport/Shooting" combo "type"
 #. item "Sport (Ball)/Soccer" combo "type"
-#. item "Sport (Ball)/Football" combo "type"
 #. item "Sport (Ball)/Australian Football" combo "type"
+#. item "Sport (Ball)/American Football" combo "type"
+#. item "Sport (Ball)/Canadian Football" combo "type"
+#. item "Sport (Ball)/Gaelic Football" combo "type"
+#. item "Sport (Ball)/Rugby League" combo "type"
+#. item "Sport (Ball)/Rugby Union" combo "type"
 #. item "Sport (Ball)/Baseball" combo "type"
 #. item "Sport (Ball)/Basketball" combo "type"
@@ -26006,5 +25978,4 @@
 #. item "Sport (Ball)/Pelota" combo "type"
 #. item "Sport (Ball)/Racquet" combo "type"
-#. item "Sport (Ball)/Rugby" combo "type"
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
@@ -26026,4 +25997,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "pitch"
 msgstr ""
@@ -26046,4 +26019,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
@@ -26066,4 +26041,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
@@ -26086,4 +26063,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "track"
 msgstr ""
@@ -26285,158 +26264,193 @@
 
 #: build/trans_presets.java:2070
-msgid "Football"
-msgstr "كرة القدم"
-
-#. item "Sport (Ball)/Football"
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
 #: build/trans_presets.java:2071
-msgid "Edit Football"
+msgid "Edit Australian Football"
+msgstr ""
+
+#: build/trans_presets.java:2076
+#, fuzzy
+msgid "American Football"
 msgstr "حرّر كرة القدم"
 
-#: build/trans_presets.java:2076
-msgid "Australian Football"
-msgstr ""
-
-#. item "Sport (Ball)/Australian Football"
+#. item "Sport (Ball)/American Football"
 #: build/trans_presets.java:2077
-msgid "Edit Australian Football"
-msgstr ""
+#, fuzzy
+msgid "Edit American Football"
+msgstr "حرّر كرة القدم"
 
 #: build/trans_presets.java:2082
+#, fuzzy
+msgid "Canadian Football"
+msgstr "حرّر كرة القدم"
+
+#. item "Sport (Ball)/Canadian Football"
+#: build/trans_presets.java:2083
+#, fuzzy
+msgid "Edit Canadian Football"
+msgstr "حرّر كرة القدم"
+
+#: build/trans_presets.java:2088
+#, fuzzy
+msgid "Gaelic Football"
+msgstr "حرّر كرة القدم"
+
+#. item "Sport (Ball)/Gaelic Football"
+#: build/trans_presets.java:2089
+#, fuzzy
+msgid "Edit Gaelic Football"
+msgstr "حرّر كرة القدم"
+
+#: build/trans_presets.java:2094
+msgid "Rugby League"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby League"
+#: build/trans_presets.java:2095
+#, fuzzy
+msgid "Edit Rugby League"
+msgstr "حرّر كسّارة / مقلع حجارة"
+
+#: build/trans_presets.java:2100
+msgid "Rugby Union"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby Union"
+#: build/trans_presets.java:2101
+#, fuzzy
+msgid "Edit Rugby Union"
+msgstr "حرّر قطر/منطقة"
+
+#: build/trans_presets.java:2106
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2107
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2112
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2113
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2118
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2119
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2122
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2124
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2125
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2130
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2131
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2136
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2137
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2142
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2143
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2148
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2149
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2154
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2155
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2160
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2161
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2166
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2167
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2148
-msgid "Rugby"
-msgstr ""
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2149
-msgid "Edit Rugby"
-msgstr ""
-
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2172
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2173
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2178
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2179
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2186
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2188
 msgid "Building"
 msgstr "مبنى"
@@ -26444,5 +26458,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2191
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -26450,10 +26464,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2193
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2197
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -26461,10 +26475,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2199
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2203
 msgid "Embassy"
 msgstr "سفارة"
@@ -26472,10 +26486,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2205
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2209
 msgid "Courthouse"
 msgstr "محكمة"
@@ -26484,10 +26498,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:2194
+#: build/trans_presets.java:2212
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2216
 msgid "Prison"
 msgstr "سجن"
@@ -26496,10 +26510,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:2201
+#: build/trans_presets.java:2219
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2223
 msgid "Police"
 msgstr "شرطة"
@@ -26509,10 +26523,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:2209
+#: build/trans_presets.java:2227
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2231
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -26521,10 +26535,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:2216
+#: build/trans_presets.java:2234
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2238
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -26532,5 +26546,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2240
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -26538,15 +26552,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2246
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2247
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2251
 msgid "School"
 msgstr "مدرسة"
@@ -26554,10 +26568,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2253
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2257
 msgid "University"
 msgstr "جامعة"
@@ -26565,10 +26579,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2259
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2263
 msgid "College"
 msgstr "كلّية"
@@ -26576,5 +26590,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2265
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -26582,5 +26596,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2270
 msgid "Cinema"
 msgstr "سينما"
@@ -26589,10 +26603,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:2255
+#: build/trans_presets.java:2273
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2277
 msgid "Library"
 msgstr "مكتبة"
@@ -26601,9 +26615,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:2262
+#: build/trans_presets.java:2280
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2285
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -26611,10 +26625,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2287
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2291
 msgid "Theatre"
 msgstr "مسرح"
@@ -26623,10 +26637,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:2276
+#: build/trans_presets.java:2294
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2298
 msgid "Place of Worship"
 msgstr "معبد"
@@ -26636,5 +26650,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:2284
+#: build/trans_presets.java:2302
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -26643,6 +26657,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "Religion"
 msgstr "الديانة"
@@ -26651,66 +26665,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -26719,81 +26733,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2310
 msgid "Addresses"
 msgstr "عناوين"
@@ -26802,5 +26816,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:2295
+#: build/trans_presets.java:2313
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -26808,5 +26822,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2315
 msgid "House number"
 msgstr "رقم المنزل"
@@ -26814,25 +26828,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2317
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2318
 msgid "Street name"
 msgstr "إسم الشارع"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2319
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2320
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2321
 msgid "Country code"
 msgstr "رمز البلد"
@@ -26841,5 +26855,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:2309
+#: build/trans_presets.java:2327
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -26847,61 +26861,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2332
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2333
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2334
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2338
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2339
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2344
 msgid "Height (meters)"
 msgstr ""
@@ -26909,25 +26923,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2348
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2349
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2353
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2354
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2358
 msgid "Lighthouse"
 msgstr "منارة"
@@ -26935,10 +26949,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2360
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2364
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -26946,10 +26960,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2366
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2370
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -26958,41 +26972,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:2355
+#: build/trans_presets.java:2373
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2358 build/trans_presets.java:2401
+#: build/trans_presets.java:2376 build/trans_presets.java:2419
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2379
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -27002,10 +27016,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:2365
+#: build/trans_presets.java:2383
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2387
 msgid "Crane"
 msgstr "ونش"
@@ -27013,5 +27027,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2389
 msgid "Edit Crane"
 msgstr "حرّر ونش"
@@ -27019,10 +27033,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2395
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2399
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -27030,10 +27044,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2401
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2405
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -27041,23 +27055,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2407
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2413
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -27067,35 +27081,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:2399
+#: build/trans_presets.java:2417
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2422
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -27104,10 +27118,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:2407
+#: build/trans_presets.java:2425
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2431
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -27116,5 +27130,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:2416
+#: build/trans_presets.java:2434
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -27122,10 +27136,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2419 build/trans_presets.java:2436
+#: build/trans_presets.java:2437 build/trans_presets.java:2454
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2439
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -27136,23 +27150,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:2426
+#: build/trans_presets.java:2444
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2445
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2445
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2446
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2448
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -27161,74 +27175,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:2433
+#: build/trans_presets.java:2451
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2457
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 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:2440
+#: build/trans_presets.java:2458
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2461
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2462
 msgid "Toilets"
 msgstr "مراحيض"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2469
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2452 build/trans_presets.java:2742
+#: build/trans_presets.java:2470 build/trans_presets.java:2760
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2472
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2477
 msgid "Telephone"
 msgstr "هاتف"
@@ -27237,5 +27251,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:2462
+#: build/trans_presets.java:2480
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -27243,5 +27257,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2465 build/trans_presets.java:2743
+#: build/trans_presets.java:2483 build/trans_presets.java:2761
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -27249,5 +27263,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2466 build/trans_presets.java:2744
+#: build/trans_presets.java:2484 build/trans_presets.java:2762
 msgid "Notes"
 msgstr "الملاحظات"
@@ -27255,5 +27269,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2467 build/trans_presets.java:2745
+#: build/trans_presets.java:2485 build/trans_presets.java:2763
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27261,5 +27275,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2468 build/trans_presets.java:2746
+#: build/trans_presets.java:2486 build/trans_presets.java:2764
 msgid "Debit cards"
 msgstr ""
@@ -27267,15 +27281,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2469 build/trans_presets.java:2747
+#: build/trans_presets.java:2487 build/trans_presets.java:2765
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2488
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2490
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -27284,5 +27298,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:2475
+#: build/trans_presets.java:2493
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -27290,35 +27304,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2495
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2496
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2497
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2498
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2499
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2500
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2502
 msgid "Waste Basket"
 msgstr ""
@@ -27326,5 +27340,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2504
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27333,31 +27347,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2510
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "brown"
 msgstr ""
@@ -27436,5 +27450,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2494 build/trans_style.java:3190
+#: build/trans_presets.java:2512 build/trans_style.java:3190
 #: build/trans_style.java:3198 build/trans_style.java:3206
 #: build/trans_style.java:3214 build/trans_style.java:3222
@@ -27444,31 +27458,31 @@
 msgstr "خضار"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2513
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2515
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2516
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27477,30 +27491,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2500 build/trans_presets.java:2982
+#: build/trans_presets.java:2518 build/trans_presets.java:3000
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2520
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2521
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2523
 msgid "Fountain"
 msgstr "نافورة"
@@ -27509,10 +27523,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:2508
+#: build/trans_presets.java:2526
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2530
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -27521,10 +27535,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:2515
+#: build/trans_presets.java:2533
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2537
 msgid "Fire Hydrant"
 msgstr ""
@@ -27533,5 +27547,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:2522
+#: build/trans_presets.java:2540
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27539,5 +27553,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2543
 msgid "Baby Hatch"
 msgstr ""
@@ -27545,15 +27559,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2545
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2551
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2552
 msgid "Car Dealer"
 msgstr ""
@@ -27561,10 +27575,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2554
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2559
 msgid "Bike Dealer"
 msgstr ""
@@ -27573,28 +27587,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:2544
+#: build/trans_presets.java:2562
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2566
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2567
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2572
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2573
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2578
 msgid "Convenience Store"
 msgstr ""
@@ -27602,9 +27616,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2580
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2585
 msgid "Kiosk"
 msgstr "كشك"
@@ -27612,27 +27626,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2587
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2592
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2593
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2598
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2599
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2604
 msgid "Butcher"
 msgstr "جزار"
@@ -27640,9 +27654,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2606
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2611
 msgid "Baker"
 msgstr "خباز"
@@ -27650,9 +27664,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2613
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2618
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -27660,18 +27674,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2620
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2625
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2626
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2631
 msgid "Alcohol"
 msgstr ""
@@ -27679,54 +27693,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2633
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2638
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2639
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2644
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2645
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2650
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2651
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2656
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2657
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2662
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2663
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2668
 msgid "Garden Centre"
 msgstr ""
@@ -27734,9 +27748,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2670
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2675
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -27744,9 +27758,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2677
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2682
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27754,54 +27768,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2684
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2689
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2690
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2695
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2696
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2701
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2702
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2707
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2708
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2713
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2714
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2719
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -27809,9 +27823,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2721
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2726
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -27819,9 +27833,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2728
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2733
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -27829,24 +27843,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2735
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2741
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2746
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2747
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
 #. <separator/>
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2753
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -27854,5 +27868,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2755
 msgid "Edit Vending machine"
 msgstr ""
@@ -27860,97 +27874,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2766
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2769
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2770
 msgid "Bank"
 msgstr "مصرف"
@@ -27958,14 +27972,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2772
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2779
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -27973,5 +27987,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2781
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -27979,15 +27993,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2788
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2793
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2794
 msgid "Doctors"
 msgstr "أطباء"
@@ -27995,18 +28009,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2796
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2801
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2802
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2807
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -28014,5 +28028,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2809
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -28020,9 +28034,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2811
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2815
 msgid "Hospital"
 msgstr "مستشفى"
@@ -28030,10 +28044,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2817
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2821
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -28042,5 +28056,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:2806
+#: build/trans_presets.java:2824
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -28049,20 +28063,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2827
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2828
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2830
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2831
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -28070,5 +28084,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2834
 msgid "Veterinary"
 msgstr "بيطري"
@@ -28077,64 +28091,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:2819
+#: build/trans_presets.java:2837
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2844
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2845
 msgid "Places"
 msgstr "الأماكن"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2846
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2847
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2852
 msgid "Country"
 msgstr "وطن"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2853
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2858
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2859
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2864
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2865
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2870
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2871
 msgid "Edit County"
 msgstr ""
@@ -28142,15 +28156,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2877
 msgid "City"
 msgstr "مدينة"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2878
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2883
 msgid "Town"
 msgstr "بلدة"
@@ -28158,10 +28172,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2885
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2890
 msgid "Suburb"
 msgstr "ضاحية"
@@ -28169,25 +28183,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2892
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2897
 msgid "Village"
 msgstr "قرية"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2898
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2903
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2904
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -28195,5 +28209,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2910
 msgid "Locality"
 msgstr "محلة"
@@ -28201,10 +28215,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2912
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2917
 msgid "Island"
 msgstr "جزيرة"
@@ -28212,10 +28226,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2919
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2924
 msgid "Islet"
 msgstr ""
@@ -28223,5 +28237,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2926
 msgid "Edit Islet"
 msgstr ""
@@ -28229,5 +28243,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2932
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -28235,10 +28249,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2934
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2938
 msgid "Peak"
 msgstr "قمّة"
@@ -28246,10 +28260,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2940
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2945
 msgid "Glacier"
 msgstr "جليد"
@@ -28257,10 +28271,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2947
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2952
 msgid "Volcano"
 msgstr "بركان"
@@ -28268,70 +28282,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2954
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2960
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2961
 msgid "National"
 msgstr "دولية"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2962
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2967
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2968
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2973
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2974
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2979
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2980
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2985
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2986
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2992
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2993
 msgid "Tree"
 msgstr "شجرة"
@@ -28340,15 +28354,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:2978
+#: build/trans_presets.java:2996
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3001
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3003
 msgid "Wood"
 msgstr "حرج"
@@ -28357,5 +28371,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:2988
+#: build/trans_presets.java:3006
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -28363,17 +28377,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3011
 msgid "Forest"
 msgstr "غابة"
@@ -28382,14 +28396,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:2996
+#: build/trans_presets.java:3014
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3020
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3021
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -28397,25 +28411,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3026
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3027
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3031
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3032
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3036
 msgid "Fell"
 msgstr ""
@@ -28423,10 +28437,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3038
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3042
 msgid "Heath"
 msgstr ""
@@ -28434,5 +28448,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3044
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -28440,5 +28454,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3049
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -28447,45 +28461,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:3034
+#: build/trans_presets.java:3052
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3057
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3058
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3063
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3064
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3069
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3070
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3075
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3076
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -28493,25 +28507,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3082
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3083
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3087
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3088
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3093
 msgid "Village Green"
 msgstr ""
@@ -28519,10 +28533,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3095
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3100
 msgid "Common"
 msgstr "شائع"
@@ -28530,20 +28544,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:3102
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3106
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3107
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3111
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -28551,5 +28565,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3113
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -28557,15 +28571,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3119
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3120
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3125
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -28573,9 +28587,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3109
+#: build/trans_presets.java:3127
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:3133
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -28583,39 +28597,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3135
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3142
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3143
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3148
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3149
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3154
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3155
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3160
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -28623,15 +28637,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3162
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3167
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3168
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -28639,50 +28653,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3174
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3175
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3180
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3181
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3186
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3187
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3192
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3193
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3198
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3199
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
@@ -28692,5 +28706,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:3193
+#: build/trans_presets.java:3211
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -28702,5 +28716,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3199 build/trans_presets.java:3216
+#: build/trans_presets.java:3217 build/trans_presets.java:3234
 msgid "outer segment"
 msgstr "الفلق الخارجي"
@@ -28708,5 +28722,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3200 build/trans_presets.java:3217
+#: build/trans_presets.java:3218 build/trans_presets.java:3235
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -28714,5 +28728,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3221
 msgid "Boundary"
 msgstr ""
@@ -28723,5 +28737,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3208
+#: build/trans_presets.java:3226
 msgid "Edit Boundary"
 msgstr ""
@@ -28729,36 +28743,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3231
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3218
+#: build/trans_presets.java:3236
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3237
 msgid "Administration centre"
 msgstr ""
@@ -28766,5 +28780,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3240
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -28773,5 +28787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3243
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -28779,34 +28793,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -28815,15 +28829,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3232
+#: build/trans_presets.java:3250
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3251
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3252
 msgid "to way"
 msgstr "إلى الطريق"
@@ -28831,5 +28845,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3255
 msgid "Route"
 msgstr "الطريق"
@@ -28838,5 +28852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3258
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -28844,5 +28858,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -28950,5 +28964,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3242 build/trans_style.java:233
+#: build/trans_presets.java:3260 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -28959,17 +28973,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "ski"
 msgstr ""
@@ -29037,5 +29051,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3242 build/trans_style.java:247
+#: build/trans_presets.java:3260 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29045,9 +29059,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "detour"
 msgstr ""
@@ -29061,10 +29075,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3242 build/trans_style.java:1233
+#: build/trans_presets.java:3260 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3263
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -29072,31 +29086,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3248
+#: build/trans_presets.java:3266
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3269
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -29105,30 +29119,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3254
+#: build/trans_presets.java:3272
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3273
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3274
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3275
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3276
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3277
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -29355,5 +29369,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4120
+#: build/trans_style.java:633 build/trans_style.java:4144
 msgid "deprecated"
 msgstr "مهجور"
@@ -32681,11 +32695,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4168 build/trans_style.java:4176
-#: build/trans_style.java:4184 build/trans_style.java:4192
-#: build/trans_style.java:4200 build/trans_style.java:4208
-#: build/trans_style.java:4216 build/trans_style.java:4224
-#: build/trans_style.java:4232 build/trans_style.java:4240
-#: build/trans_style.java:4248 build/trans_style.java:4256
-#: build/trans_style.java:4264
+#: build/trans_style.java:4192 build/trans_style.java:4200
+#: build/trans_style.java:4208 build/trans_style.java:4216
+#: build/trans_style.java:4224 build/trans_style.java:4232
+#: build/trans_style.java:4240 build/trans_style.java:4248
+#: build/trans_style.java:4256 build/trans_style.java:4264
+#: build/trans_style.java:4272 build/trans_style.java:4280
+#: build/trans_style.java:4288
 msgid "place"
 msgstr "المكان"
@@ -32699,5 +32713,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4272
+#: build/trans_style.java:4296
 msgid "tiger_data"
 msgstr ""
@@ -33053,4 +33067,7 @@
 msgstr ""
 
+#~ msgid "Football"
+#~ msgstr "كرة القدم"
+
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
