Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 26716)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 26717)
@@ -4,27 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
-#. <type>tms</type>
-#. <default>true</default>
-#. <url><![CDATA[http://tile.openstreetmap.org/{zoom}/{x}/{y}.png]]></url>
-#. <max-zoom>18</max-zoom>
-#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
-#. <attribution-url>http://openstreetmap.org/</attribution-url>
-#. </entry>
-#. <!--true;OpenStreetMap (Mapnik B&W);tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
-#. <entry>
-#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
-#. <type>wms</type>
-#. <url><![CDATA[http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?]]></url>
-#. <country-code>DE</country-code>
-#. </entry>
-#. <!--false;Hike & Bike;tms[18]:http://toolserver.org/tiles/hikebike/;;;osm;osm;osm-->
-#. <entry>
-#. <name>Hike &amp; Bike</name>
-#: build/trans_wms.java:52 build/trans_wms.java:130
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 21:25+0200\n"
+"POT-Creation-Date: 2011-09-27 19:09+0200\n"
 "PO-Revision-Date: 2010-12-30 18:13+0000\n"
 "Last-Translator: Hsn <hh.alshawaf@gmail.com>\n"
@@ -36,6 +18,6 @@
 "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: 2011-09-02 19:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:49+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -45,6 +27,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:361
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:194
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:368
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -69,8 +51,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:131
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:175
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:111
@@ -82,7 +64,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:447
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:453
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:197
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
@@ -96,8 +78,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
@@ -109,5 +92,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:182
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:199
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:213
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:388
@@ -117,6 +99,6 @@
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:495
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:501
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:480
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:486
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -130,10 +112,11 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:181
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:69
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:49
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:49
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:45
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:47
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:45
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:190
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:216
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:260
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:196
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:222
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:266
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:64
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
 msgid "Warning"
@@ -167,14 +150,14 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:771
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:510
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:523
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:127
-#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:267
+#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:273
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
@@ -185,7 +168,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:898
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:877
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:722
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -201,6 +184,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:117
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1209
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1230
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
@@ -210,5 +193,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:376
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:508
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685
@@ -386,8 +369,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:227
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -401,6 +384,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -412,6 +395,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
@@ -426,6 +409,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1364
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
@@ -447,7 +430,9 @@
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:97
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:389
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:462
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
@@ -464,5 +449,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
+#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:70
 msgid "Cancel"
 msgstr "إلغاء"
@@ -473,4 +458,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java:141
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr ""
@@ -529,4 +515,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
@@ -575,5 +562,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
@@ -591,4 +578,5 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:145
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
@@ -609,5 +597,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:39
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37
@@ -625,4 +613,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:26
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:28
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:30
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:29
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:29
@@ -654,8 +643,8 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:625
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:665
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1000
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1030
@@ -684,5 +673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:75
 msgid "data"
 msgstr "المعطيات"
@@ -751,5 +740,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:374
 msgid "Close open changesets"
 msgstr "أغلق حزمات التغييرات المفتوحة"
@@ -769,6 +758,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:47
 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:68
@@ -846,9 +835,10 @@
 msgstr "الرجاء إختيار شيء للنسخ."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:19
 msgid "Copy Coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:18
 msgid "Copy coordinates of selected nodes to clipboard."
 msgstr ""
@@ -903,13 +893,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:381
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:643
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:144
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:354
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:742
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:886
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -921,5 +911,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:132
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:257
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:100
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:98
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:260
@@ -939,14 +929,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:225
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:102
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:227
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:96
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:97
 msgid "Overwrite"
 msgstr "الكتابة فوقه"
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:99
 msgid "File exists. Overwrite?"
 msgstr "الملف موجود. الكتابة عليه ؟"
@@ -1131,5 +1121,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:564
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:569
 #, java-format
 msgid "Layer: {0}"
@@ -1203,11 +1193,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "خط الغرض الزمني"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:23
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:65
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
+msgid "History"
+msgstr "الخط الزمني"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:20
+msgid "History (web)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:18
+msgid ""
+"Display history information about OSM ways, nodes, or relations in web "
+"browser."
 msgstr ""
 
@@ -1253,5 +1257,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152
+#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:70
 msgid "OK"
 msgstr "مُوافق"
@@ -1278,11 +1282,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20
-msgid "Info about Element"
-msgstr "معلومات حول العنصر"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:23
+msgid "Advanced info"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:21
+msgid ""
+"Display advanced object information about OSM nodes, ways, or relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:20
+msgid "Advanced info (web)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:18
+msgid ""
+"Display object information about OSM nodes, ways, or relations in web "
+"browser."
 msgstr ""
 
@@ -1303,6 +1319,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:336
+msgid "Join area confirmation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:337
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:81
 msgid "The selected way has nodes outside of the downloaded data region."
@@ -1312,21 +1331,24 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 msgid "This can lead to nodes being deleted accidentally."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:341
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:695
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:839
 msgid "Please abort if you are not sure"
 msgstr "الرجاء إجهاض العملية إن لم تكن أكيداَ"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:362
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:384
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
+msgid "The selected area is incomplete. Continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:355
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:377
 msgid "No intersection found. Nothing was changed."
 msgstr ""
@@ -1334,33 +1356,33 @@
 #. revert changes
 #. FIXME: this is dirty hack
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:383
 msgid "Reverting changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:451
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:444
 msgid "Added node on all intersections"
 msgstr "تمت إضافة العقدة على كل التقطعات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:516
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:509
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:522
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:515
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1368,23 +1390,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "صلّح تضاربات التسمية"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1234
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1244
 msgid ""
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1249
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1263
 msgid ""
 "Sorry. Cannot handle way that is both inner and outer in multipolygon "
@@ -1392,19 +1414,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1268
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1261
 msgid ""
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363
 msgid "Removed Element from Relations"
 msgstr "تم حذف العنصر من العلاقات"
 
 #. I18N: current action printed in status display
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1439
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1432
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr ""
@@ -1609,4 +1631,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline" display value
 #. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Highways/Streets/Ford" combo "Incline" display value
 #. item "Ways/Track" combo "Incline" display value
 #. item "Ways/Path" combo "Incline" display value
@@ -1626,8 +1649,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "up"
 msgstr "إلى أعلى"
@@ -1647,4 +1671,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline" display value
 #. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Highways/Streets/Ford" combo "Incline" display value
 #. item "Ways/Track" combo "Incline" display value
 #. item "Ways/Path" combo "Incline" display value
@@ -1664,8 +1689,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "down"
 msgstr "إلى أسفل"
@@ -1746,20 +1772,31 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156
 #, java-format
-msgid "Cannot open {0} file because no suitable file importer is available."
+msgid ""
+"Cannot open {0} file because file does not exist or no suitable file "
+"importer is available."
 msgid_plural ""
-"Cannot open {0} files because no suitable file importer is available."
+"Cannot open {0} files because files do not exist or no suitable file "
+"importer is available."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167
+msgid "no importer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167
+msgid "does not exist"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:213
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1768,5 +1805,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1886,7 +1923,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:299
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:300
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:230
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:124
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264
@@ -2051,5 +2088,5 @@
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:237
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1408
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1418
 msgid "Save"
 msgstr "إحفَظ"
@@ -2065,30 +2102,30 @@
 msgstr "الوثيقة {0} موجودة. الكتابة عليها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "No Exporter found! Nothing saved."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "مستند فارغ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "رغم ذلك احفظه"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "The document contains no data."
 msgstr "لا يحتوي المستند على أي معطيات."
 
 #. I18N: Display title of the window showing conflicts
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
 msgid "Conflicts"
 msgstr "التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -2096,13 +2133,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "إحفظ ملف أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "إحفظ ملف GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "إحفظ الطبقة"
@@ -2153,5 +2190,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
@@ -2161,55 +2198,22 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1384
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1394
 msgid "Close"
 msgstr "اغلق"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Delete unnecessary nodes from a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:66
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
-msgid "Yes, delete nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
-msgid "Delete nodes outside of downloaded data regions"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:263
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
-msgid "No, abort"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:120
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
-msgid "Cancel operation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
-msgid "Do you want to delete them anyway?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
-msgid "Delete nodes outside of data regions?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:49
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:90
 msgid "Please select at least one way to simplify."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -2220,10 +2224,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:95
 msgid "Simplify all selected ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
+msgid "Cancel operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2232,10 +2242,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:77
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 msgid "Simplify ways?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:196
 #, java-format
@@ -2245,5 +2255,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:189
 #, java-format
 msgid "Simplify Way (remove {0} node)"
@@ -2305,5 +2315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:446
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:494
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:479
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -2312,5 +2322,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:452
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:500
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:485
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -2346,47 +2356,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:86
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
 msgid "None of this way''s nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "إختر أي من :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid "* One node that is used by more than one way, or"
 msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -2396,14 +2406,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:377
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:400
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2411,4 +2421,21 @@
 msgstr[0] ""
 msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:427
+msgid "Unglue confirmation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:428
+msgid ""
+"You are about to unglue nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to unglue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:433
+msgid ""
+"You are about to unglue incomplete objects.<br>This will cause problems "
+"because you don''t see the real object.<br>Do you really want to unglue?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -2504,14 +2531,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
 msgid "Upload data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2520,5 +2547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:114
@@ -2526,5 +2553,5 @@
 msgstr "لا يوجد تغييرات للتحميل."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:196
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
@@ -2992,8 +3019,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:109
@@ -3355,5 +3382,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:249
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:253
 msgid "Search"
 msgstr "إبحث"
@@ -3575,5 +3602,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102
-#: build/trans_presets.java:1723 build/trans_presets.java:3632
+#: build/trans_presets.java:1722 build/trans_presets.java:3633
 msgid "Other"
 msgstr ""
@@ -3720,25 +3747,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
 #, java-format
 msgid "Delete node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:151
 #, java-format
 msgid "Delete way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152
 #, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
 #, java-format
 msgid "Delete {0} object"
@@ -3747,5 +3774,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} node"
@@ -3754,5 +3781,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -3761,5 +3788,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -3768,13 +3795,15 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:188
 #, java-format
 msgid "Deleted ''{0}''"
 msgstr ""
 
-#. leave message in one tr() as there is a grammatical
-#. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:425
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:430
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
+msgid "Delete confirmation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:431
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3783,14 +3812,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
-msgid "Delete confirmation"
-msgstr ""
-
-#. leave message in one tr() as there is a grammatical
-#. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
@@ -4004,4 +4024,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:81
+#: ../core/src/org/openstreetmap/josm/data/imagery/Shape.java:59
 #, java-format
 msgid "Illegal latitude value ''{0}''"
@@ -4009,19 +4030,20 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
+#: ../core/src/org/openstreetmap/josm/data/imagery/Shape.java:67
 #, java-format
 msgid "Illegal longitude value ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:336
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:337
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:459
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4030,5 +4052,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4037,5 +4059,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4044,5 +4066,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4051,5 +4073,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4057,5 +4079,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4064,5 +4086,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4071,5 +4093,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4078,5 +4100,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4085,5 +4107,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:562
 #, java-format
 msgid "Paint style {0}: {1}"
@@ -4157,20 +4179,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
 msgctxt "compass"
 msgid "S"
 msgstr "ج."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
 msgctxt "compass"
 msgid "N"
 msgstr "ش."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:127
 msgctxt "compass"
 msgid "W"
 msgstr "غ."
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4187,5 +4209,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:186
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:344
 #, java-format
 msgid "ID > 0 expected. Got {0}."
@@ -4193,5 +4215,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:188
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:342
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:346
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -4209,5 +4231,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346
 #, java-format
 msgid ""
@@ -4215,5 +4237,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817
 #, java-format
 msgid ""
@@ -4282,5 +4304,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:946
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:950
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -4288,5 +4310,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952
 #, java-format
 msgid ""
@@ -4297,5 +4319,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:13
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
 msgid "node"
 msgid_plural "nodes"
@@ -4326,6 +4348,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:445
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:630
 msgid "relation"
 msgid_plural "relations"
@@ -4672,5 +4694,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
+#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:271
 #, java-format
 msgid ""
@@ -4697,4 +4719,9 @@
 #, java-format
 msgid "Running test {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:26
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:78
+msgid "Building inside building"
 msgstr ""
 
@@ -4750,71 +4777,98 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:108
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:26
+msgid "Deprecated Tags"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:26
+msgid "Checks and corrects deprecated tags"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:165
+#, java-format
+msgid "Deprecation fix of {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:170
+#, java-format
+msgid "{0} is deprecated"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:172
+msgid " or "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:172
+#, java-format
+msgid "{0} is deprecated, use {1} instead"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109
 msgid "Duplicated nodes."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:110
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:196
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197
 msgid "Duplicate nodes in two un-closed ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:200
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:211
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:222
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:233
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:244
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:255
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:266
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:277
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:288
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:299
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:310
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:201
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:212
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:223
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:234
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:245
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:256
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:267
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:278
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:289
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:300
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:311
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:207
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208
 msgid "Mixed type duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:218
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:219
 msgid "Highway duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:229
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:230
 msgid "Railway duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:240
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:241
 msgid "Waterway duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:251
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:252
 msgid "Boundary duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:262
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:263
 msgid "Power duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:273
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:274
 msgid "Natural duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:284
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:285
 msgid "Building duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:295
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:296
 msgid "Landuse duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:306
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:307
 msgid "Other duplicated nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:334
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:335
 msgid "Nodes at same position"
 msgstr ""
@@ -4877,54 +4931,54 @@
 
 #. item "Relations/Multipolygon"
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4272
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52
+#: build/trans_presets.java:4273
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:53
 msgid "This test checks if multipolygons are valid"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:122
 msgid "Area style way is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:146
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:147
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:182
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:183
 msgid "No style for multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:184
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:185
 msgid "No style in multipolygon relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:203
 msgid "Style for inner way equals multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:220
 msgid "Style for outer way mismatches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:228
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:238
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:251
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:261
 msgid "Multipolygon inner way is outside"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:254
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:264
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:265
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:275
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:269
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:279
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -4958,4 +5012,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java:28
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java:56
+msgid "Overlapping Areas"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:45
 msgid "Overlapping ways."
@@ -4968,29 +5027,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103
-msgid "Overlapping areas"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:106
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:105
 msgid "Overlapping highways (with area)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:109
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:108
 msgid "Overlapping railways (with area)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:112
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:111
 msgid "Overlapping ways (with area)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:117
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:116
 msgid "Overlapping highways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:120
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:119
 msgid "Overlapping railways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:123
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:122
 msgid "Overlapping ways"
 msgstr ""
@@ -5191,7 +5246,7 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1088
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:876
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:466
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
@@ -5212,7 +5267,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1100
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5238,5 +5293,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:228
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:892
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
 msgid "Please select the row to delete."
@@ -5396,48 +5451,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:30
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:30
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:72
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:70
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:76
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:74
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:80
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:78
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:84
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:82
 #, java-format
 msgid "sport type {0}"
 msgstr "نوع الرياضة {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:88
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:86
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:92
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:90
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:96
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:94
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:100
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:98
 #, java-format
 msgid "waterway type {0}"
@@ -5485,7 +5540,7 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #. color building
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:394
-#: build/trans_style.java:3600
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:102
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:435
+#: build/trans_style.java:3615
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 msgid "building"
@@ -5497,10 +5552,10 @@
 #. <condition k="area" b="yes"/>
 #. color area
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:108
-#: build/trans_style.java:3605
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:106
+#: build/trans_style.java:3620
 msgid "area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:128
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:115
 msgid "Unclosed way"
 msgstr ""
@@ -5629,7 +5684,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:84
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:119
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:546
 #, java-format
 msgid " [id: {0}]"
@@ -5665,14 +5720,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:287
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:303
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
 msgid "incomplete"
 msgstr "غير كامل"
 
 #. I18n: name of house as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:150
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:234
 #, java-format
 msgid "House {0}"
@@ -5681,6 +5737,6 @@
 #. I18n: house number, street as parameter, number should remain
 #. before street for better visibility
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:156
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:241
 #, java-format
 msgid "House number {0} at {1}"
@@ -5688,12 +5744,12 @@
 
 #. I18n: house number as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:236
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:245
 #, java-format
 msgid "House number {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:224
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:600
 msgid "highway"
 msgstr "من النوع طريق"
@@ -5701,17 +5757,17 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:601
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "railway"
 msgstr "خط سكة حديد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:602
 msgid "waterway"
 msgstr "مجرى مياه"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:227
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:603
 msgid "landuse"
 msgstr "إستعمال الأرض"
@@ -5720,8 +5776,8 @@
 #. nevertheless, who knows what future brings
 #. I18n: count of nodes as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:265
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:608
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:769
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:768
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422
@@ -5736,6 +5792,6 @@
 msgstr[5] "{0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:308
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:658
 #, java-format
 msgid "{0} member"
@@ -5744,9 +5800,9 @@
 msgstr[1] "{0} أعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:494
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5852,5 +5908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:87
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192
 msgid "Imagery"
 msgstr ""
@@ -6080,5 +6136,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -6086,10 +6142,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
 #: build/specialmessages.java:89
 msgid "View"
 msgstr "العرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:189
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
@@ -6098,5 +6154,5 @@
 msgstr "العدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -6104,5 +6160,5 @@
 msgstr "التعيينات المسبقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:228
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -6113,5 +6169,5 @@
 msgstr "اللائحة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "سمعيّ"
@@ -6148,5 +6204,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:93
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:192
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:190
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203
 msgid "Move up"
@@ -6154,5 +6210,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:98
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:165
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:163
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
 msgid "Move down"
@@ -6303,5 +6359,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6484,5 +6540,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:134
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:440
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
@@ -6492,5 +6548,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
@@ -6500,5 +6556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:246
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:144
 msgid "Members"
 msgstr "الأعضاء"
@@ -6722,5 +6778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:181
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:466
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:618
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:783
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1035
@@ -6848,4 +6904,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:305
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:190
 msgid "deleted"
 msgstr "تم حذفه"
@@ -6915,6 +6972,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -6936,6 +6993,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7045,5 +7102,5 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7126,5 +7183,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:457
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:765
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427
@@ -7140,5 +7197,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:458
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:773
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:772
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
 #, java-format
@@ -7270,9 +7327,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:164
 msgid "For selected objects only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:165
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7281,18 +7338,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:243
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:245
 msgid "Open the list of changesets in the current layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:290
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:339
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
@@ -7300,23 +7357,23 @@
 msgstr "نزّل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:340
 msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:375
 msgid "Closes the selected open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:406
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
 msgid "Show info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:407
 msgid "Open a web page for each selected changeset"
 msgstr ""
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:446
 #: build/specialmessages.java:49
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
@@ -7324,5 +7381,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:447
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr ""
@@ -7341,12 +7398,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:65
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:608
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7393,5 +7450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:110
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
@@ -7567,19 +7624,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
-#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
-msgid "History"
-msgstr "الخط الزمني"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64
 msgid "Display the history of all selected items."
 msgstr "أعرض الخط الزمني للبنود المختارة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:242
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:260
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
@@ -7589,10 +7640,10 @@
 msgstr "أعد التحميل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة."
 
 #. JButton
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:334
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:774
@@ -7604,149 +7655,140 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Display the history of the selected objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66
 msgid "Advanced object info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77
 msgid "map style"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-msgid "In conflict with:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
-#, java-format
-msgid "Node id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
+#, java-format
+msgid " ({0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:144
+msgid "not in data set"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:191
-msgid " not in data set"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152
+msgid "Node: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:171
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
-msgid " incomplete\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157
-#, java-format
-msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:167
-#, java-format
-msgid "Way id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
-#, java-format
-msgid " {0} node; "
-msgid_plural " {0} nodes; "
+msgid "Relation: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:193
+msgid "deleted-on-server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:196
+msgid "modified"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199
+msgid "filtered/hidden"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:202
+msgid "filtered/disabled"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:206
+msgid "has direction keys (reversed)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:208
+msgid "has direction keys"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:213
+msgid "State: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:218
+msgid "Data Set: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:219
+msgid "Edited at: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:313
+msgid "<new object>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
+msgid "Edited by: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:223
+msgid "Version: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224
+msgid "In changeset: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:229
+msgid "Tags: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:250
+#, java-format
+msgid "{0} Member: "
+msgid_plural "{0} Members: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182
-msgid "  nodes:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
-#, java-format
-msgid "Relation id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199
-#, java-format
-msgid " {0} member; "
-msgid_plural " {0} members; "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:204
-msgid "  members:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:313
-msgid "<new object>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:212
-#, java-format
-msgid ""
-"Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: {4}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
-msgid "; deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224
-msgid "; deleted-on-server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227
-msgid "; modified"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230
-msgid "; filtered/hidden"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233
-msgid "; filtered/disabled"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:236
-msgid "; has direction keys"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:238
-msgid " (reversed)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:246
-msgid "  tags:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:258
-msgid "  way referrer:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:269
-msgid "  relation referrer:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:295
-#, java-format
-msgid "id: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:297
-#, java-format
-msgid " name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300
-#, java-format
-msgid " {0} name: {1}"
-msgid_plural " {0} names: {1}"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:254
+#, java-format
+msgid " as \"{0}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:260
+#, java-format
+msgid "{0} Nodes: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:270
+msgid "Bounding box: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:275
+msgid "Coordinates: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:278
+msgid "Coordinates (projected): "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:286
+msgid "Part of: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:298
+msgid "In conflict with: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:325
 #, java-format
 msgid "Styles Cache for \"{0}\":"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
 #, java-format
 msgid ""
@@ -7756,5 +7798,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:333
 #, java-format
 msgid ""
@@ -7763,5 +7805,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:338
 #, java-format
 msgid ""
@@ -7771,5 +7813,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -7778,22 +7820,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:354
 msgid "The 2 selected objects have identical style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:357
 msgid "The 2 selected objects have different style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:360
 msgid ""
 "Warning: The 2 selected objects have equal, but not identical style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:367
 msgid "xml"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:369
 msgid "mapcss"
 msgstr ""
@@ -7811,5 +7853,5 @@
 #. item "Facilities/Hunting Stand" combo "Hide" display value
 #. item "Facilities/Hunting Stand" combo "Lock" display value
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:371
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -7821,10 +7863,10 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:581 build/trans_presets.java:640
-#: build/trans_presets.java:777 build/trans_presets.java:799
-#: build/trans_presets.java:1424 build/trans_presets.java:1597
-#: build/trans_presets.java:1598 build/trans_presets.java:1599
-#: build/trans_presets.java:2375 build/trans_presets.java:2722
-#: build/trans_presets.java:2723 build/trans_presets.java:2724
+#: build/trans_presets.java:591 build/trans_presets.java:650
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:1423 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1598
+#: build/trans_presets.java:2376 build/trans_presets.java:2723
+#: build/trans_presets.java:2724 build/trans_presets.java:2725
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -7901,5 +7943,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1462
 msgid "Show/Hide"
 msgstr "عرض/إخفاء"
@@ -7918,5 +7960,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:604
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:644
 msgid "Activate"
 msgstr ""
@@ -7950,9 +7992,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:953
 msgid "Move the selected layer one row up."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:974
 msgid "Move the selected layer one row down."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
@@ -8025,5 +8067,5 @@
 #. item "Power/Power Generator" combo "Source"
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
@@ -8066,24 +8108,24 @@
 
 #. group "Relations"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
-#: build/trans_presets.java:4271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:775
+#: build/trans_presets.java:4272
 msgid "Relations"
 msgstr "العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 msgid "Open a list of all relations."
 msgstr "إفتح لائحة بكل العلاقات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:273
 msgid "Open an editor for the selected relation"
 msgstr "إفتح محرر نص للعلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:314
 msgid "Delete the selected relation"
 msgstr "أمحي العلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:352
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40
@@ -8092,5 +8134,5 @@
 msgstr "أنشئ علاقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19
@@ -8098,133 +8140,125 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
 msgid "Add the selected relations to the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Select relation (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1232
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
 msgid "Add the members of all selected relations to current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:468
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
 msgid "Select members (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1263
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:818
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:817
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1282
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:538
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1284
 msgid "Download incomplete members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:773
 #, java-format
 msgid "Relations: {0}"
 msgstr "العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
-msgid "Current Selection"
-msgstr "الخيار الحالي"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "إفتح نافذة لائحة خيارات."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:255
-msgid "Search for objects"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:310
-msgid "Zoom to selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-msgid "Zoom to selected element(s)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
-msgid "Call editor for relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:376
-msgid "Call relation editor for selected relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1226
-#: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
-msgid "Select in relation list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:404
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1227
-#: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
-msgid "Select relation in relation list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:62
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:67
 msgid "Selection"
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+msgid "Open a selection list window."
+msgstr "إفتح نافذة لائحة خيارات."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+msgid "Current Selection"
+msgstr "الخيار الحالي"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254
+msgid "Search for objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309
+msgid "Zoom to selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+msgid "Zoom to selected element(s)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:374
+msgid "Call editor for relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
+msgid "Call relation editor for selected relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1236
+#: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17
+msgid "Select in relation list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1237
+#: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18
+msgid "Select relation in relation list."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:464
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:783
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:782
 #, java-format
 msgid "Selection: {0}"
 msgstr "الخيار: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
-msgid "Get detailed information on the internal state of the objects."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
-msgid "Inspect"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
@@ -8307,10 +8341,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
+msgid "Validation Results"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
+msgid "Open the validation window."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
 msgid "Validation results"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
-msgid "Open the validation window."
 msgstr ""
 
@@ -8658,4 +8695,9 @@
 #. <optional>
 #. item "Highways/Streets/Tunnel" text "Name"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:ford" />
+#. <space />
+#. <key key="ford" value="yes" />
+#. <optional>
+#. item "Highways/Streets/Ford" text "Name"
 #. <space />
 #. <key key="highway" value="track" />
@@ -8711,8 +8753,4 @@
 #. <space />
 #. item "Waypoints/City Limit" text "Name"
-#. <space />
-#. <key key="highway" value="ford" />
-#. <optional>
-#. item "Waypoints/Ford" text "Name"
 #. <space />
 #. <key key="mountain_pass" value="yes" />
@@ -9497,5 +9535,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 #: build/specialmessages.java:70 build/trans_presets.java:116
 #: build/trans_presets.java:154 build/trans_presets.java:196
@@ -9506,179 +9544,180 @@
 #: build/trans_presets.java:423 build/trans_presets.java:482
 #: build/trans_presets.java:503 build/trans_presets.java:519
-#: build/trans_presets.java:535 build/trans_presets.java:561
-#: build/trans_presets.java:598 build/trans_presets.java:632
-#: build/trans_presets.java:657 build/trans_presets.java:681
-#: build/trans_presets.java:702 build/trans_presets.java:723
-#: build/trans_presets.java:743 build/trans_presets.java:753
-#: build/trans_presets.java:764 build/trans_presets.java:826
-#: build/trans_presets.java:844 build/trans_presets.java:853
-#: build/trans_presets.java:926 build/trans_presets.java:1085
-#: build/trans_presets.java:1093 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1120
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1143 build/trans_presets.java:1150
-#: build/trans_presets.java:1164 build/trans_presets.java:1171
-#: build/trans_presets.java:1176 build/trans_presets.java:1183
-#: build/trans_presets.java:1188 build/trans_presets.java:1194
-#: build/trans_presets.java:1201 build/trans_presets.java:1211
-#: build/trans_presets.java:1217 build/trans_presets.java:1223
-#: build/trans_presets.java:1228 build/trans_presets.java:1234
-#: build/trans_presets.java:1242 build/trans_presets.java:1251
-#: build/trans_presets.java:1258 build/trans_presets.java:1264
-#: build/trans_presets.java:1281 build/trans_presets.java:1288
-#: build/trans_presets.java:1295 build/trans_presets.java:1392
-#: build/trans_presets.java:1444 build/trans_presets.java:1458
-#: build/trans_presets.java:1469 build/trans_presets.java:1482
-#: build/trans_presets.java:1495 build/trans_presets.java:1509
-#: build/trans_presets.java:1520 build/trans_presets.java:1531
-#: build/trans_presets.java:1542 build/trans_presets.java:1553
-#: build/trans_presets.java:1563 build/trans_presets.java:1574
-#: build/trans_presets.java:1580 build/trans_presets.java:1590
-#: build/trans_presets.java:1611 build/trans_presets.java:1643
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1667 build/trans_presets.java:1683
-#: build/trans_presets.java:1694 build/trans_presets.java:1703
-#: build/trans_presets.java:1712 build/trans_presets.java:1736
-#: build/trans_presets.java:1744 build/trans_presets.java:1758
-#: build/trans_presets.java:1769 build/trans_presets.java:1779
-#: build/trans_presets.java:1789 build/trans_presets.java:1809
-#: build/trans_presets.java:1821 build/trans_presets.java:1832
-#: build/trans_presets.java:1852 build/trans_presets.java:1867
-#: build/trans_presets.java:1875 build/trans_presets.java:1932
-#: build/trans_presets.java:1949 build/trans_presets.java:1967
-#: build/trans_presets.java:1984 build/trans_presets.java:2001
-#: build/trans_presets.java:2018 build/trans_presets.java:2035
-#: build/trans_presets.java:2053 build/trans_presets.java:2075
-#: build/trans_presets.java:2094 build/trans_presets.java:2115
-#: build/trans_presets.java:2134 build/trans_presets.java:2151
-#: build/trans_presets.java:2170 build/trans_presets.java:2188
-#: build/trans_presets.java:2205 build/trans_presets.java:2222
-#: build/trans_presets.java:2238 build/trans_presets.java:2245
-#: build/trans_presets.java:2253 build/trans_presets.java:2260
-#: build/trans_presets.java:2277 build/trans_presets.java:2285
-#: build/trans_presets.java:2300 build/trans_presets.java:2310
-#: build/trans_presets.java:2322 build/trans_presets.java:2332
-#: build/trans_presets.java:2339 build/trans_presets.java:2348
-#: build/trans_presets.java:2357 build/trans_presets.java:2363
-#: build/trans_presets.java:2372 build/trans_presets.java:2382
-#: build/trans_presets.java:2387 build/trans_presets.java:2395
-#: build/trans_presets.java:2402 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2426
-#: build/trans_presets.java:2433 build/trans_presets.java:2439
-#: build/trans_presets.java:2447 build/trans_presets.java:2458
-#: build/trans_presets.java:2470 build/trans_presets.java:2476
-#: build/trans_presets.java:2483 build/trans_presets.java:2491
-#: build/trans_presets.java:2498 build/trans_presets.java:2505
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2526 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2552 build/trans_presets.java:2559
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2596 build/trans_presets.java:2604
-#: build/trans_presets.java:2636 build/trans_presets.java:2714
-#: build/trans_presets.java:2732 build/trans_presets.java:2742
-#: build/trans_presets.java:2757 build/trans_presets.java:2766
-#: build/trans_presets.java:2775 build/trans_presets.java:2784
-#: build/trans_presets.java:2793 build/trans_presets.java:2799
-#: build/trans_presets.java:2807 build/trans_presets.java:2813
-#: build/trans_presets.java:2819 build/trans_presets.java:2825
-#: build/trans_presets.java:2831 build/trans_presets.java:2837
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2861
-#: build/trans_presets.java:2867 build/trans_presets.java:2873
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
-#: build/trans_presets.java:2892 build/trans_presets.java:2901
-#: build/trans_presets.java:2909 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2927
-#: build/trans_presets.java:2933 build/trans_presets.java:2939
-#: build/trans_presets.java:2945 build/trans_presets.java:2951
-#: build/trans_presets.java:2957 build/trans_presets.java:2965
-#: build/trans_presets.java:2974 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3041
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3074 build/trans_presets.java:3080
-#: build/trans_presets.java:3093 build/trans_presets.java:3108
-#: build/trans_presets.java:3115 build/trans_presets.java:3123
-#: build/trans_presets.java:3128 build/trans_presets.java:3143
-#: build/trans_presets.java:3150 build/trans_presets.java:3162
-#: build/trans_presets.java:3172 build/trans_presets.java:3179
-#: build/trans_presets.java:3188 build/trans_presets.java:3195
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3215 build/trans_presets.java:3221
-#: build/trans_presets.java:3235 build/trans_presets.java:3245
-#: build/trans_presets.java:3251 build/trans_presets.java:3262
-#: build/trans_presets.java:3282 build/trans_presets.java:3338
-#: build/trans_presets.java:3344 build/trans_presets.java:3352
-#: build/trans_presets.java:3359 build/trans_presets.java:3365
-#: build/trans_presets.java:3371 build/trans_presets.java:3377
-#: build/trans_presets.java:3382 build/trans_presets.java:3387
-#: build/trans_presets.java:3392 build/trans_presets.java:3401
-#: build/trans_presets.java:3408 build/trans_presets.java:3415
-#: build/trans_presets.java:3423 build/trans_presets.java:3430
-#: build/trans_presets.java:3438 build/trans_presets.java:3447
-#: build/trans_presets.java:3455 build/trans_presets.java:3464
-#: build/trans_presets.java:3473 build/trans_presets.java:3480
-#: build/trans_presets.java:3488 build/trans_presets.java:3494
-#: build/trans_presets.java:3502 build/trans_presets.java:3510
-#: build/trans_presets.java:3517 build/trans_presets.java:3524
-#: build/trans_presets.java:3530 build/trans_presets.java:3538
-#: build/trans_presets.java:3545 build/trans_presets.java:3551
-#: build/trans_presets.java:3559 build/trans_presets.java:3568
-#: build/trans_presets.java:3574 build/trans_presets.java:3582
-#: build/trans_presets.java:3591 build/trans_presets.java:3598
-#: build/trans_presets.java:3604 build/trans_presets.java:3613
-#: build/trans_presets.java:3622 build/trans_presets.java:3638
-#: build/trans_presets.java:3647 build/trans_presets.java:3655
-#: build/trans_presets.java:3661 build/trans_presets.java:3667
-#: build/trans_presets.java:3675 build/trans_presets.java:3684
-#: build/trans_presets.java:3693 build/trans_presets.java:3700
-#: build/trans_presets.java:3708 build/trans_presets.java:3715
-#: build/trans_presets.java:3723 build/trans_presets.java:3731
-#: build/trans_presets.java:3739 build/trans_presets.java:3748
-#: build/trans_presets.java:3757 build/trans_presets.java:3765
-#: build/trans_presets.java:3773 build/trans_presets.java:3780
-#: build/trans_presets.java:3787 build/trans_presets.java:3795
-#: build/trans_presets.java:3802 build/trans_presets.java:3810
-#: build/trans_presets.java:3837 build/trans_presets.java:3843
-#: build/trans_presets.java:3849 build/trans_presets.java:3855
-#: build/trans_presets.java:3861 build/trans_presets.java:3869
-#: build/trans_presets.java:3876 build/trans_presets.java:3883
-#: build/trans_presets.java:3890 build/trans_presets.java:3897
-#: build/trans_presets.java:3905 build/trans_presets.java:3913
-#: build/trans_presets.java:3921 build/trans_presets.java:3928
-#: build/trans_presets.java:3935 build/trans_presets.java:3942
-#: build/trans_presets.java:3951 build/trans_presets.java:3960
-#: build/trans_presets.java:3968 build/trans_presets.java:3976
-#: build/trans_presets.java:3984 build/trans_presets.java:3993
-#: build/trans_presets.java:4001 build/trans_presets.java:4011
-#: build/trans_presets.java:4021 build/trans_presets.java:4030
-#: build/trans_presets.java:4036 build/trans_presets.java:4042
-#: build/trans_presets.java:4048 build/trans_presets.java:4053
-#: build/trans_presets.java:4059 build/trans_presets.java:4069
-#: build/trans_presets.java:4075 build/trans_presets.java:4081
-#: build/trans_presets.java:4087 build/trans_presets.java:4094
-#: build/trans_presets.java:4101 build/trans_presets.java:4107
-#: build/trans_presets.java:4113 build/trans_presets.java:4120
-#: build/trans_presets.java:4126 build/trans_presets.java:4131
-#: build/trans_presets.java:4138 build/trans_presets.java:4145
-#: build/trans_presets.java:4151 build/trans_presets.java:4160
-#: build/trans_presets.java:4168 build/trans_presets.java:4174
-#: build/trans_presets.java:4180 build/trans_presets.java:4187
-#: build/trans_presets.java:4195 build/trans_presets.java:4201
-#: build/trans_presets.java:4208 build/trans_presets.java:4214
-#: build/trans_presets.java:4220 build/trans_presets.java:4226
-#: build/trans_presets.java:4232 build/trans_presets.java:4279
-#: build/trans_presets.java:4293 build/trans_presets.java:4312
-#: build/trans_presets.java:4331 build/trans_presets.java:4361
-#: build/trans_presets.java:4386
+#: build/trans_presets.java:532 build/trans_presets.java:545
+#: build/trans_presets.java:571 build/trans_presets.java:608
+#: build/trans_presets.java:642 build/trans_presets.java:667
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:733 build/trans_presets.java:753
+#: build/trans_presets.java:763 build/trans_presets.java:774
+#: build/trans_presets.java:836 build/trans_presets.java:855
+#: build/trans_presets.java:928 build/trans_presets.java:1084
+#: build/trans_presets.java:1092 build/trans_presets.java:1100
+#: build/trans_presets.java:1108 build/trans_presets.java:1119
+#: build/trans_presets.java:1128 build/trans_presets.java:1134
+#: build/trans_presets.java:1142 build/trans_presets.java:1149
+#: build/trans_presets.java:1163 build/trans_presets.java:1170
+#: build/trans_presets.java:1175 build/trans_presets.java:1182
+#: build/trans_presets.java:1187 build/trans_presets.java:1193
+#: build/trans_presets.java:1200 build/trans_presets.java:1210
+#: build/trans_presets.java:1216 build/trans_presets.java:1222
+#: build/trans_presets.java:1227 build/trans_presets.java:1233
+#: build/trans_presets.java:1241 build/trans_presets.java:1250
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1280 build/trans_presets.java:1287
+#: build/trans_presets.java:1294 build/trans_presets.java:1391
+#: build/trans_presets.java:1443 build/trans_presets.java:1457
+#: build/trans_presets.java:1468 build/trans_presets.java:1481
+#: build/trans_presets.java:1494 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1530
+#: build/trans_presets.java:1541 build/trans_presets.java:1552
+#: build/trans_presets.java:1562 build/trans_presets.java:1573
+#: build/trans_presets.java:1579 build/trans_presets.java:1589
+#: build/trans_presets.java:1610 build/trans_presets.java:1642
+#: build/trans_presets.java:1652 build/trans_presets.java:1658
+#: build/trans_presets.java:1666 build/trans_presets.java:1682
+#: build/trans_presets.java:1693 build/trans_presets.java:1702
+#: build/trans_presets.java:1711 build/trans_presets.java:1735
+#: build/trans_presets.java:1745 build/trans_presets.java:1759
+#: build/trans_presets.java:1770 build/trans_presets.java:1780
+#: build/trans_presets.java:1790 build/trans_presets.java:1810
+#: build/trans_presets.java:1822 build/trans_presets.java:1833
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+#: build/trans_presets.java:1876 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1968
+#: build/trans_presets.java:1985 build/trans_presets.java:2002
+#: build/trans_presets.java:2019 build/trans_presets.java:2036
+#: build/trans_presets.java:2054 build/trans_presets.java:2076
+#: build/trans_presets.java:2095 build/trans_presets.java:2116
+#: build/trans_presets.java:2135 build/trans_presets.java:2152
+#: build/trans_presets.java:2171 build/trans_presets.java:2189
+#: build/trans_presets.java:2206 build/trans_presets.java:2223
+#: build/trans_presets.java:2239 build/trans_presets.java:2246
+#: build/trans_presets.java:2254 build/trans_presets.java:2261
+#: build/trans_presets.java:2278 build/trans_presets.java:2286
+#: build/trans_presets.java:2301 build/trans_presets.java:2311
+#: build/trans_presets.java:2323 build/trans_presets.java:2333
+#: build/trans_presets.java:2340 build/trans_presets.java:2349
+#: build/trans_presets.java:2358 build/trans_presets.java:2364
+#: build/trans_presets.java:2373 build/trans_presets.java:2383
+#: build/trans_presets.java:2388 build/trans_presets.java:2396
+#: build/trans_presets.java:2403 build/trans_presets.java:2411
+#: build/trans_presets.java:2420 build/trans_presets.java:2427
+#: build/trans_presets.java:2434 build/trans_presets.java:2440
+#: build/trans_presets.java:2448 build/trans_presets.java:2459
+#: build/trans_presets.java:2471 build/trans_presets.java:2477
+#: build/trans_presets.java:2484 build/trans_presets.java:2492
+#: build/trans_presets.java:2499 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2521
+#: build/trans_presets.java:2527 build/trans_presets.java:2535
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2553 build/trans_presets.java:2560
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2597 build/trans_presets.java:2605
+#: build/trans_presets.java:2637 build/trans_presets.java:2715
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2758 build/trans_presets.java:2767
+#: build/trans_presets.java:2776 build/trans_presets.java:2785
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:2808 build/trans_presets.java:2814
+#: build/trans_presets.java:2820 build/trans_presets.java:2826
+#: build/trans_presets.java:2832 build/trans_presets.java:2838
+#: build/trans_presets.java:2844 build/trans_presets.java:2850
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2886
+#: build/trans_presets.java:2893 build/trans_presets.java:2902
+#: build/trans_presets.java:2910 build/trans_presets.java:2916
+#: build/trans_presets.java:2922 build/trans_presets.java:2928
+#: build/trans_presets.java:2934 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2952
+#: build/trans_presets.java:2958 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2982
+#: build/trans_presets.java:2988 build/trans_presets.java:2994
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3050 build/trans_presets.java:3056
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
+#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:3094 build/trans_presets.java:3109
+#: build/trans_presets.java:3116 build/trans_presets.java:3124
+#: build/trans_presets.java:3129 build/trans_presets.java:3144
+#: build/trans_presets.java:3151 build/trans_presets.java:3163
+#: build/trans_presets.java:3173 build/trans_presets.java:3180
+#: build/trans_presets.java:3189 build/trans_presets.java:3196
+#: build/trans_presets.java:3203 build/trans_presets.java:3209
+#: build/trans_presets.java:3216 build/trans_presets.java:3222
+#: build/trans_presets.java:3236 build/trans_presets.java:3246
+#: build/trans_presets.java:3252 build/trans_presets.java:3263
+#: build/trans_presets.java:3283 build/trans_presets.java:3339
+#: build/trans_presets.java:3345 build/trans_presets.java:3353
+#: build/trans_presets.java:3360 build/trans_presets.java:3366
+#: build/trans_presets.java:3372 build/trans_presets.java:3378
+#: build/trans_presets.java:3383 build/trans_presets.java:3388
+#: build/trans_presets.java:3393 build/trans_presets.java:3402
+#: build/trans_presets.java:3409 build/trans_presets.java:3416
+#: build/trans_presets.java:3424 build/trans_presets.java:3431
+#: build/trans_presets.java:3439 build/trans_presets.java:3448
+#: build/trans_presets.java:3456 build/trans_presets.java:3465
+#: build/trans_presets.java:3474 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3495
+#: build/trans_presets.java:3503 build/trans_presets.java:3511
+#: build/trans_presets.java:3518 build/trans_presets.java:3525
+#: build/trans_presets.java:3531 build/trans_presets.java:3539
+#: build/trans_presets.java:3546 build/trans_presets.java:3552
+#: build/trans_presets.java:3560 build/trans_presets.java:3569
+#: build/trans_presets.java:3575 build/trans_presets.java:3583
+#: build/trans_presets.java:3592 build/trans_presets.java:3599
+#: build/trans_presets.java:3605 build/trans_presets.java:3614
+#: build/trans_presets.java:3623 build/trans_presets.java:3639
+#: build/trans_presets.java:3648 build/trans_presets.java:3656
+#: build/trans_presets.java:3662 build/trans_presets.java:3668
+#: build/trans_presets.java:3676 build/trans_presets.java:3685
+#: build/trans_presets.java:3694 build/trans_presets.java:3701
+#: build/trans_presets.java:3709 build/trans_presets.java:3716
+#: build/trans_presets.java:3724 build/trans_presets.java:3732
+#: build/trans_presets.java:3740 build/trans_presets.java:3749
+#: build/trans_presets.java:3758 build/trans_presets.java:3766
+#: build/trans_presets.java:3774 build/trans_presets.java:3781
+#: build/trans_presets.java:3788 build/trans_presets.java:3796
+#: build/trans_presets.java:3803 build/trans_presets.java:3811
+#: build/trans_presets.java:3838 build/trans_presets.java:3844
+#: build/trans_presets.java:3850 build/trans_presets.java:3856
+#: build/trans_presets.java:3862 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3891 build/trans_presets.java:3898
+#: build/trans_presets.java:3906 build/trans_presets.java:3914
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3936 build/trans_presets.java:3943
+#: build/trans_presets.java:3952 build/trans_presets.java:3961
+#: build/trans_presets.java:3969 build/trans_presets.java:3977
+#: build/trans_presets.java:3985 build/trans_presets.java:3994
+#: build/trans_presets.java:4002 build/trans_presets.java:4012
+#: build/trans_presets.java:4022 build/trans_presets.java:4031
+#: build/trans_presets.java:4037 build/trans_presets.java:4043
+#: build/trans_presets.java:4049 build/trans_presets.java:4054
+#: build/trans_presets.java:4060 build/trans_presets.java:4070
+#: build/trans_presets.java:4076 build/trans_presets.java:4082
+#: build/trans_presets.java:4088 build/trans_presets.java:4095
+#: build/trans_presets.java:4102 build/trans_presets.java:4108
+#: build/trans_presets.java:4114 build/trans_presets.java:4121
+#: build/trans_presets.java:4127 build/trans_presets.java:4132
+#: build/trans_presets.java:4139 build/trans_presets.java:4146
+#: build/trans_presets.java:4152 build/trans_presets.java:4161
+#: build/trans_presets.java:4169 build/trans_presets.java:4175
+#: build/trans_presets.java:4181 build/trans_presets.java:4188
+#: build/trans_presets.java:4196 build/trans_presets.java:4202
+#: build/trans_presets.java:4209 build/trans_presets.java:4215
+#: build/trans_presets.java:4221 build/trans_presets.java:4227
+#: build/trans_presets.java:4233 build/trans_presets.java:4280
+#: build/trans_presets.java:4294 build/trans_presets.java:4314
+#: build/trans_presets.java:4333 build/trans_presets.java:4363
+#: build/trans_presets.java:4388
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:68
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
@@ -10097,9 +10136,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:180
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212
 #, java-format
 msgid "This will change {0} object."
@@ -10108,14 +10147,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:636
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:710
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:646
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:720
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:164
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:309
@@ -10127,5 +10166,5 @@
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:277
 msgid "Change value?"
 msgid_plural "Change values?"
@@ -10133,13 +10172,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:323
 msgid "Overwrite key"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:324
 msgid "Replace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:326
 #, java-format
 msgid ""
@@ -10148,5 +10187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
@@ -10156,5 +10195,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:417
 #, java-format
 msgid "This will change up to {0} object."
@@ -10163,31 +10202,31 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:419
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:471
 msgid "Add value?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:554
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:608
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:607
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10196,63 +10235,87 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2746
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661
+#: build/trans_presets.java:2747
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:965
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:968
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1021
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1034
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1046
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1058
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1089
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1091
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1132
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1133
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1233
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
 msgid "Select the members of selected relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1333
+msgid "Copy Value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1334
+msgid "Copy the value of the selected tag to clipboard"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1346
+msgid "Copy Key/Value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1347
+msgid "Copy the key and value of the selected tag to clipboard"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1360
+msgid "Copy all Keys/Values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1361
+msgid "Copy the key and value of the all tags to clipboard"
 msgstr ""
 
@@ -10738,57 +10801,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:345
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
 msgid "Please enter a name for the bookmarked download area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
 msgid "Remove the currently selected bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
 msgid "Rename the currently selected bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:103
 msgid "min lat"
 msgstr "خ. العرض الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lon"
 msgstr "خ. الطول الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "max lat"
 msgstr "خ. العرض الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lon"
 msgstr "خ. الطول الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "Clear textarea"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -10796,10 +10859,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "العلبة المحاطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:226
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:258
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:227
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:259
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:157
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:197
@@ -10808,15 +10871,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:231
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:161
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:263
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:201
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:232
 msgid "Paste URL from clipboard"
@@ -10892,13 +10955,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Bounds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
-msgid "Near"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
-msgctxt "placeselection"
-msgid "Zoom"
 msgstr ""
 
@@ -10947,7 +11001,12 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Waypoints/Traffic Calming" combo "Type"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#. <optional>
+#. item "Barriers/Fence" combo "Type"
 #. item "Water/Water/Wetland" combo "Type"
 #. item "Car/Parking" combo "Type"
 #. item "Motorcycle/Parking" combo "Type"
+#. item "Bicycle/Parking" combo "Type"
 #. item "Culture/Recording Studio" combo "Type"
 #. item "Facilities/Recycling" combo "Type"
@@ -10963,12 +11022,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: build/specialmessages.java:84 build/trans_presets.java:480
-#: build/trans_presets.java:799 build/trans_presets.java:808
-#: build/trans_presets.java:1212 build/trans_presets.java:1592
-#: build/trans_presets.java:1705 build/trans_presets.java:2460
-#: build/trans_presets.java:2695 build/trans_presets.java:2739
-#: build/trans_presets.java:2967 build/trans_presets.java:2976
-#: build/trans_presets.java:3136 build/trans_presets.java:3252
-#: build/trans_presets.java:4012 build/trans_presets.java:4022
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:809 build/trans_presets.java:818
+#: build/trans_presets.java:955 build/trans_presets.java:1211
+#: build/trans_presets.java:1591 build/trans_presets.java:1704
+#: build/trans_presets.java:1737 build/trans_presets.java:2461
+#: build/trans_presets.java:2696 build/trans_presets.java:2740
+#: build/trans_presets.java:2968 build/trans_presets.java:2977
+#: build/trans_presets.java:3137 build/trans_presets.java:3253
+#: build/trans_presets.java:4013 build/trans_presets.java:4023
+#: build/trans_presets.java:4032
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -11051,4 +11111,6 @@
 #. putValue(NAME, tr("Back"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:449
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:482
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:482
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:482
 msgid "Go to the previous page"
@@ -11086,5 +11148,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138
 msgid "Coordinates"
 msgstr ""
@@ -11109,10 +11171,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:285
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:315
 #, java-format
 msgid ""
@@ -11120,5 +11182,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:288
 #, java-format
 msgid ""
@@ -11126,9 +11188,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:313
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:318
 #, java-format
 msgid ""
@@ -11210,13 +11272,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:123
 msgid "Changeset info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:124
 msgid "Launch browser with information about the changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:143
 #, java-format
 msgid "Show changeset {0}"
@@ -11780,5 +11842,5 @@
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 #: build/trans_presets.java:117 build/trans_presets.java:135
 #: build/trans_presets.java:155 build/trans_presets.java:175
@@ -11790,11 +11852,11 @@
 #: build/trans_presets.java:430 build/trans_presets.java:488
 #: build/trans_presets.java:504 build/trans_presets.java:520
-#: build/trans_presets.java:545 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:641
-#: build/trans_presets.java:665 build/trans_presets.java:690
-#: build/trans_presets.java:710 build/trans_presets.java:731
-#: build/trans_presets.java:1086 build/trans_presets.java:1094
-#: build/trans_presets.java:1102 build/trans_presets.java:1110
-#: build/trans_presets.java:1121 build/trans_presets.java:1398
+#: build/trans_presets.java:555 build/trans_presets.java:595
+#: build/trans_presets.java:616 build/trans_presets.java:651
+#: build/trans_presets.java:675 build/trans_presets.java:700
+#: build/trans_presets.java:720 build/trans_presets.java:741
+#: build/trans_presets.java:1085 build/trans_presets.java:1093
+#: build/trans_presets.java:1101 build/trans_presets.java:1109
+#: build/trans_presets.java:1120 build/trans_presets.java:1397
 msgid "Layer"
 msgstr ""
@@ -11814,5 +11876,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:499
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:504
 msgid "Upload"
 msgstr ""
@@ -11835,5 +11897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:123
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:275
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:84
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:87
@@ -11846,5 +11908,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:127
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:490
 msgid "Tags of new changeset"
 msgstr ""
@@ -11863,30 +11925,30 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:177
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:501
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:506
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Upload Changes"
 msgstr "حمّل التغييرات"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:382
 msgid "Please revise upload comment"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid "Revise"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid "Continue as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:385
 msgid ""
 "Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -11897,33 +11959,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:395
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400
 msgid "Return to the previous dialog to enter a more descriptive comment"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Cancel and return to the previous dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:397
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Ignore this hint and upload anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:405
 msgid "Do not show this message again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:414
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 #, java-format
 msgid "Tags of changeset {0}"
@@ -12275,5 +12337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
-#: build/trans_presets.java:4334 build/trans_presets.java:4364
+#: build/trans_presets.java:4336 build/trans_presets.java:4366
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -12632,5 +12694,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
 #, java-format
 msgid ""
@@ -12640,65 +12702,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:365
 msgid "Show Errors"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
 msgid "Load Tile"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:385
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:408
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:417
 msgid "Load All Error Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
 msgid "Increase zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:436
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:447
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:458
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1312
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1291
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1314
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1293
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1297
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1401
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1380
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -12713,103 +12775,77 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:153
-#, java-format
-msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:155
-msgid "(deactivated)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:194
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:213
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:196
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:254
-#, java-format
-msgid ""
-"<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with a "
-"''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. "
-"You should check your<br>preference settings.<br>Do you want to fetch WMS "
-"tiles anyway?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:262
-msgid "Yes, fetch images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:268
-msgid "Invalid URL?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:564
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:518
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:525
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537
 msgid "Change resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:586
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:653
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:607
 msgid "Alpha channel"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:638
+msgid "Save WMS layer to file"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:643
+msgid "Save WMS layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:667
+msgid "Load WMS layer from file"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:672
+msgid "Load WMS layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:683
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684
-msgid "Save WMS layer to file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:689
-msgid "Save WMS layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:713
-msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:718
-msgid "Load WMS layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:729
-#, java-format
-msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:730
 msgid "File Format Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:767
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:721
 msgid "Error loading file"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:735
+msgid "Set WMS Bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
+msgid "Automatic downloading"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
-msgid "Set WMS Bookmark"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
-msgid "Automatic downloading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:827
 msgid "Zoom to native resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:943
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:888
 #, java-format
 msgid "Supported projections are: {0}"
@@ -13175,5 +13211,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:91
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:497
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:497
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:497
 msgid "Next"
@@ -13372,4 +13411,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
 msgid "Save Access Token in preferences"
 msgstr ""
@@ -13515,4 +13555,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:359
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:480
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:480
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:480
 msgid "Back"
@@ -13590,8 +13632,4 @@
 "Please enter an OAuth Access Token which is authorized to access the OSM "
 "server ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
-msgid "Save Access Token to preferences"
 msgstr ""
 
@@ -13943,26 +13981,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722
 msgid "Menu Name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:88
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:89
 msgid "Unnamed Imagery Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:95
 msgid "WMS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:101
 msgid "Service URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:106
 msgid "Get Layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:144
 msgid ""
 "That layer does not support any of JOSM''s projections,\n"
@@ -13970,49 +14008,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:349
+msgid "WMS Error"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:179
+msgid "Show Bounds"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:181
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:297
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:319
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:338
-msgid "WMS Error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:178
-msgid "Show Bounds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:180
 msgid "No bounding box was found for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:191
 msgid "TMS URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:204
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:205
 msgctxt "layer"
 msgid "Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:214
 msgid "TMS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:215
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722
 msgid "Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:296
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:299
 msgid "Could not parse WMS layer list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:318
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:329
 msgid "Invalid service URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:348
 msgid "Could not retrieve WMS layer list."
 msgstr ""
@@ -14220,5 +14257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
 #, java-format
 msgid "Choose a color for {0}"
@@ -14354,5 +14391,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:145
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
@@ -14420,5 +14457,5 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1583
 msgid "Car"
 msgstr "السيارة"
@@ -14444,14 +14481,14 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:452 build/trans_presets.java:579
-#: build/trans_presets.java:870 build/trans_presets.java:880
-#: build/trans_presets.java:889 build/trans_presets.java:901
-#: build/trans_presets.java:915 build/trans_presets.java:937
-#: build/trans_presets.java:980 build/trans_presets.java:993
-#: build/trans_presets.java:1005 build/trans_presets.java:1017
-#: build/trans_presets.java:1029 build/trans_presets.java:1041
-#: build/trans_presets.java:1051 build/trans_presets.java:1060
-#: build/trans_presets.java:1069 build/trans_presets.java:1731
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:452 build/trans_presets.java:589
+#: build/trans_presets.java:872 build/trans_presets.java:882
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:917 build/trans_presets.java:939
+#: build/trans_presets.java:979 build/trans_presets.java:992
+#: build/trans_presets.java:1004 build/trans_presets.java:1016
+#: build/trans_presets.java:1028 build/trans_presets.java:1040
+#: build/trans_presets.java:1050 build/trans_presets.java:1059
+#: build/trans_presets.java:1068 build/trans_presets.java:1730
+#: build/trans_presets.java:1812
 msgid "Bicycle"
 msgstr "الدراجة"
@@ -14490,13 +14527,13 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:448 build/trans_presets.java:578
-#: build/trans_presets.java:869 build/trans_presets.java:879
-#: build/trans_presets.java:888 build/trans_presets.java:900
-#: build/trans_presets.java:914 build/trans_presets.java:936
-#: build/trans_presets.java:979 build/trans_presets.java:992
-#: build/trans_presets.java:1004 build/trans_presets.java:1016
-#: build/trans_presets.java:1028 build/trans_presets.java:1040
-#: build/trans_presets.java:1050 build/trans_presets.java:1059
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:448 build/trans_presets.java:588
+#: build/trans_presets.java:871 build/trans_presets.java:881
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:916 build/trans_presets.java:938
+#: build/trans_presets.java:978 build/trans_presets.java:991
+#: build/trans_presets.java:1003 build/trans_presets.java:1015
+#: build/trans_presets.java:1027 build/trans_presets.java:1039
+#: build/trans_presets.java:1049 build/trans_presets.java:1058
+#: build/trans_presets.java:1067
 msgid "Foot"
 msgstr "المشي"
@@ -14642,113 +14679,117 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
 msgid "imagery fade"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:136
 msgid "Fade Color: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:140
 msgid "Fade amount: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:146
 msgid "Soft"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:147
 msgid "Strong"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:148
 msgid "Sharpen (requires layer re-add): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:152
 msgid "Use offset server: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:174
 msgid "Downloader:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181
 msgid "% of east:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
 msgid "% of north:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197
 msgid "Simultaneous connections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:213
 msgid "Auto zoom by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:217
 msgid "Autoload tiles by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:221
 msgid "Min. zoom level: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:225
 msgid "Max. zoom level: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:229
 msgid "Add to slippymap chooser: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:233
 msgid "Tile cache directory: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255
 msgid "Common Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256
 msgid "WMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257
 msgid "TMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Imagery Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Modify list of imagery layers displayed in the Imagery menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274
 msgid "Imagery providers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276
 msgid "Offset bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:406
+msgid "Imagery Background: Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470
 msgid "Available default entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:428
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:504
 msgid "Selected entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
@@ -14759,55 +14800,55 @@
 msgstr "جديد"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:447
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:599
 msgid "Add a new WMS/TMS entry by entering the URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:455
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:607
 msgid "Add Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:619
 msgid "Remove entry"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:493
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:645
 msgid "copy selected defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:664
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:549
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:707
 msgid "reload defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785
 msgid "Imagery URL (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:686
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:830
 #, java-format
 msgid "EULA license URL not available: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:700
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:844
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Easting"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Northing"
 msgstr ""
@@ -15386,7 +15427,9 @@
 msgstr ""
 
+#. System.out.println("pref:"+addr);
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:67
 msgid "Reset"
 msgstr ""
@@ -15934,5 +15977,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479
 #, java-format
 msgid ""
@@ -15941,5 +15984,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:484
 #, java-format
 msgid ""
@@ -15979,28 +16022,28 @@
 msgstr "ميزات خيارية:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1031
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1032
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1150
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1171
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1158
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1179
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1198
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1219
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -16010,15 +16053,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1229
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1270
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1328
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1349
 #: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
@@ -16032,22 +16075,22 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1364
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1434
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1455
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16109,4 +16152,39 @@
 msgid ""
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:100
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:112
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
+#, java-format
+msgid "Deleted node {0} is part of way {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:119
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
+#, java-format
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:161
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
+#, java-format
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:185
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
+#, java-format
+msgid "Deleted member {0} is used by relation {1}"
 msgstr ""
 
@@ -16692,5 +16770,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:84
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:104
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:143
@@ -16806,5 +16884,4 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:158
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:100
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:139
@@ -16815,5 +16892,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:87
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:107
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:146
@@ -16841,4 +16918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:80
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286
@@ -16884,14 +16962,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:57
 #, java-format
 msgid "No data found in file {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:58
 msgid "Open OSM file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:170
 #, java-format
@@ -16901,10 +16979,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
-msgid "Found XML element <nd> not as direct child of element <way>."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216
+#, java-format
+msgid "Deleted way {0} contains nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
@@ -16913,5 +16992,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:153
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:188
@@ -16921,16 +17000,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216
-#, java-format
-msgid "Deleted way {0} contains nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
-msgid "Found XML element <member> not as direct child of element <relation>."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267
+#, java-format
+msgid "Deleted relation {0} contains members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
 #, java-format
@@ -16938,5 +17012,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:248
 #, java-format
@@ -16944,5 +17018,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:193
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:252
@@ -16951,5 +17025,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:199
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:257
@@ -16959,21 +17033,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:263
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267
-#, java-format
-msgid "Deleted relation {0} contains members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:221
 msgid "Missing key or value attribute in tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
@@ -16982,5 +17050,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
@@ -16988,6 +17056,6 @@
 msgstr "غرض غير مسموح به معروف بــ id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
@@ -17000,8 +17068,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:408
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345
@@ -17015,5 +17083,5 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:413
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353
 #, java-format
@@ -17021,5 +17089,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:419
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
@@ -17028,6 +17096,6 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:461
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388
@@ -17041,6 +17109,6 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:392
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391
@@ -17051,5 +17119,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:474
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
@@ -17058,5 +17126,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
@@ -17065,52 +17133,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:437
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440
-#, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:449
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452
-#, java-format
-msgid "Deleted node {0} is part of way {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460
-#, java-format
-msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516
-#, java-format
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535
-#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540
-#, java-format
-msgid "Deleted member {0} is used by relation {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:541
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:250
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:542
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:256
 msgid "Preparing data set..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:566
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221
@@ -17266,4 +17301,33 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "ملفات الخادم أو.أس.أم"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "أعرض الإحداثيات كــ"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "آخر تغيير في {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, java-format
+msgid "Invalid timestamp: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:112
+msgid "Invalid DenseNodes key/values table"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:251
+#, fuzzy
+msgid "Reading OSM data..."
+msgstr "جاري تنزيل معطيات أو.أس.أم"
+
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
@@ -17283,11 +17347,4 @@
 msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
-#, java-format
-msgid ""
-"Warning: Could not detect type of imagery source ''{0}''. Using default "
-"(xml)."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -17303,29 +17360,4 @@
 #, java-format
 msgid "Querying offset: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:147
-#, java-format
-msgid ""
-"Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing "
-"''&'' or a trailing ''?''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:148
-msgid ""
-"Warning: Fetching WMS tiles is likely to fail. Please check you preference "
-"settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:149
-#, java-format
-msgid "Warning: The complete URL is ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:196
-#, java-format
-msgid ""
-"The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
-"This may lead to wrong coordinates."
 msgstr ""
 
@@ -18065,10 +18097,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:630
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:82
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:90
 #: ../core/src/org/openstreetmap/josm/tools/ImageRequest.java:81
 #, java-format
@@ -18078,5 +18110,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:330
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192
@@ -18085,6 +18117,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:340
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:354
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:387
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:401
 #, java-format
 msgid ""
@@ -18119,5 +18151,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18127,5 +18159,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:503
 msgid ""
 "This action will have no shortcut.\n"
@@ -18135,5 +18167,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18144,5 +18176,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:507
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(تلميحة: يمكنك تحرير المختصرات في التفضيلات)"
@@ -18773,16 +18805,21 @@
 msgstr ""
 
+#. Plugin GpxPoints
+#: build/trans_plugins.java:49
+msgid "Plugin for walking through waypoints in opened GPX files"
+msgstr ""
+
 #. Plugin graphview
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin imageryadjust
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "WMSPlugin-style imagery adjustment mapmode"
 msgstr ""
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -18792,15 +18829,15 @@
 
 #. Plugin ImportImagePlugin
-#: build/trans_plugins.java:55 build/trans_plugins.java:57
+#: build/trans_plugins.java:57 build/trans_plugins.java:59
 msgid "Plugin for importing spatial referenced images"
 msgstr ""
 
 #. Plugin importvec
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Import vector graphics (SVG)"
 msgstr ""
 
 #. Plugin ImproveWayAccuracy
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Can be useful when you are improving accuracy of existing ways. The idea of "
@@ -18810,5 +18847,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -18817,10 +18854,10 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin junctionchecking
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
@@ -18829,10 +18866,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
 msgstr ""
 
 #. Plugin licensechange
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Checks if all users contributing to an object have agreed to the license "
@@ -18841,5 +18878,5 @@
 
 #. Plugin livegps
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -18847,5 +18884,5 @@
 
 #. Plugin mapdust
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "The MapDust Plug-In shows the MapDust bug reports on       the map. You can "
@@ -18855,5 +18892,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -18863,25 +18900,25 @@
 
 #. Plugin merge-overlap
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Merge overlapping part of ways."
 msgstr ""
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin namemanager
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
 
 #. Plugin native_password_manager
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Use your system''s password manager to store the API username and password. "
@@ -18890,5 +18927,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -18898,15 +18935,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -18914,5 +18951,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -18920,10 +18957,10 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid "Import PDF file and convert to ways."
 msgstr ""
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:103
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -18932,5 +18969,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:105
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18939,15 +18976,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin proj4j
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:109
+#: build/trans_plugins.java:111
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -18955,25 +18992,25 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid "Relation and multipolygon creating and editing panel."
 msgstr ""
 
 #. Plugin restart
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:121
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -18983,5 +19020,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18990,10 +19027,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:127
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -19003,20 +19040,20 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:127 build/trans_plugins.java:129
+#: build/trans_plugins.java:129 build/trans_plugins.java:131
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:137
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -19026,15 +19063,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -19043,5 +19080,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19050,10 +19087,10 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -19061,5 +19098,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19068,15 +19105,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:155
 msgid "Several utilities that make your life easier."
 msgstr ""
 
 #. Plugin videomapping
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:157
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19086,5 +19123,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19093,20 +19130,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:161
+#: build/trans_plugins.java:163
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:163
+#: build/trans_plugins.java:165
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:165
+#: build/trans_plugins.java:167
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19271,9 +19308,9 @@
 #: build/trans_presets.java:173 build/trans_presets.java:194
 #: build/trans_presets.java:236 build/trans_presets.java:258
-#: build/trans_presets.java:1888 build/trans_presets.java:1896
-#: build/trans_presets.java:1904 build/trans_presets.java:1938
-#: build/trans_presets.java:2743 build/trans_presets.java:3284
-#: build/trans_presets.java:3300 build/trans_presets.java:4332
-#: build/trans_presets.java:4362
+#: build/trans_presets.java:1889 build/trans_presets.java:1897
+#: build/trans_presets.java:1905 build/trans_presets.java:1939
+#: build/trans_presets.java:2744 build/trans_presets.java:3285
+#: build/trans_presets.java:3301 build/trans_presets.java:4334
+#: build/trans_presets.java:4364
 msgid "Reference"
 msgstr ""
@@ -19326,6 +19363,6 @@
 #: build/trans_presets.java:433 build/trans_presets.java:463
 #: build/trans_presets.java:505 build/trans_presets.java:521
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:596 build/trans_presets.java:617
+#: build/trans_presets.java:1399
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -19374,9 +19411,9 @@
 #: build/trans_presets.java:403 build/trans_presets.java:424
 #: build/trans_presets.java:443 build/trans_presets.java:483
-#: build/trans_presets.java:544 build/trans_presets.java:577
-#: build/trans_presets.java:600 build/trans_presets.java:622
-#: build/trans_presets.java:634 build/trans_presets.java:659
-#: build/trans_presets.java:683 build/trans_presets.java:725
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:554 build/trans_presets.java:587
+#: build/trans_presets.java:610 build/trans_presets.java:632
+#: build/trans_presets.java:644 build/trans_presets.java:669
+#: build/trans_presets.java:693 build/trans_presets.java:735
+#: build/trans_presets.java:1392
 msgid "Oneway"
 msgstr ""
@@ -19426,9 +19463,9 @@
 #: build/trans_presets.java:425 build/trans_presets.java:484
 #: build/trans_presets.java:494 build/trans_presets.java:501
-#: build/trans_presets.java:539 build/trans_presets.java:572
-#: build/trans_presets.java:601 build/trans_presets.java:635
-#: build/trans_presets.java:660 build/trans_presets.java:684
-#: build/trans_presets.java:704 build/trans_presets.java:726
-#: build/trans_presets.java:1394 build/trans_surveyor.java:12
+#: build/trans_presets.java:549 build/trans_presets.java:582
+#: build/trans_presets.java:611 build/trans_presets.java:645
+#: build/trans_presets.java:670 build/trans_presets.java:694
+#: build/trans_presets.java:714 build/trans_presets.java:736
+#: build/trans_presets.java:1393 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -19469,9 +19506,9 @@
 #: build/trans_presets.java:369 build/trans_presets.java:405
 #: build/trans_presets.java:426 build/trans_presets.java:485
-#: build/trans_presets.java:511 build/trans_presets.java:540
-#: build/trans_presets.java:573 build/trans_presets.java:602
-#: build/trans_presets.java:636 build/trans_presets.java:661
-#: build/trans_presets.java:685 build/trans_presets.java:705
-#: build/trans_presets.java:727 build/trans_presets.java:1395
+#: build/trans_presets.java:511 build/trans_presets.java:550
+#: build/trans_presets.java:583 build/trans_presets.java:612
+#: build/trans_presets.java:646 build/trans_presets.java:671
+#: build/trans_presets.java:695 build/trans_presets.java:715
+#: build/trans_presets.java:737 build/trans_presets.java:1394
 msgid "Tunnel"
 msgstr ""
@@ -19510,9 +19547,9 @@
 #: build/trans_presets.java:370 build/trans_presets.java:406
 #: build/trans_presets.java:427 build/trans_presets.java:486
-#: build/trans_presets.java:541 build/trans_presets.java:574
-#: build/trans_presets.java:603 build/trans_presets.java:637
-#: build/trans_presets.java:662 build/trans_presets.java:686
-#: build/trans_presets.java:706 build/trans_presets.java:728
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:551 build/trans_presets.java:584
+#: build/trans_presets.java:613 build/trans_presets.java:647
+#: build/trans_presets.java:672 build/trans_presets.java:696
+#: build/trans_presets.java:716 build/trans_presets.java:738
+#: build/trans_presets.java:1395
 msgid "Cutting"
 msgstr ""
@@ -19551,9 +19588,9 @@
 #: build/trans_presets.java:371 build/trans_presets.java:407
 #: build/trans_presets.java:428 build/trans_presets.java:487
-#: build/trans_presets.java:542 build/trans_presets.java:575
-#: build/trans_presets.java:604 build/trans_presets.java:638
-#: build/trans_presets.java:663 build/trans_presets.java:687
-#: build/trans_presets.java:707 build/trans_presets.java:729
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:552 build/trans_presets.java:585
+#: build/trans_presets.java:614 build/trans_presets.java:648
+#: build/trans_presets.java:673 build/trans_presets.java:697
+#: build/trans_presets.java:717 build/trans_presets.java:739
+#: build/trans_presets.java:1396
 msgid "Embankment"
 msgstr ""
@@ -19592,9 +19629,9 @@
 #: build/trans_presets.java:372 build/trans_presets.java:392
 #: build/trans_presets.java:408 build/trans_presets.java:429
-#: build/trans_presets.java:543 build/trans_presets.java:576
-#: build/trans_presets.java:605 build/trans_presets.java:639
-#: build/trans_presets.java:664 build/trans_presets.java:688
-#: build/trans_presets.java:708 build/trans_presets.java:730
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:553 build/trans_presets.java:586
+#: build/trans_presets.java:615 build/trans_presets.java:649
+#: build/trans_presets.java:674 build/trans_presets.java:698
+#: build/trans_presets.java:718 build/trans_presets.java:740
+#: build/trans_presets.java:2353
 msgid "Lit"
 msgstr ""
@@ -19680,4 +19717,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline"
 #. item "Highways/Streets/Tunnel" combo "Incline"
+#. item "Highways/Streets/Ford" combo "Incline"
 #. item "Ways/Track" combo "Incline"
 #. item "Ways/Path" combo "Incline"
@@ -19695,8 +19733,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "Incline"
 msgstr ""
@@ -19716,4 +19755,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline" display value
 #. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Highways/Streets/Ford" combo "Incline" display value
 #. item "Ways/Track" combo "Incline" display value
 #. item "Ways/Path" combo "Incline" display value
@@ -19731,8 +19771,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "10%"
 msgstr ""
@@ -19752,4 +19793,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline" display value
 #. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Highways/Streets/Ford" combo "Incline" display value
 #. item "Ways/Track" combo "Incline" display value
 #. item "Ways/Path" combo "Incline" display value
@@ -19767,8 +19809,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "-10%"
 msgstr ""
@@ -19788,4 +19831,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline" display value
 #. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Highways/Streets/Ford" combo "Incline" display value
 #. item "Ways/Track" combo "Incline" display value
 #. item "Ways/Path" combo "Incline" display value
@@ -19803,8 +19847,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "10°"
 msgstr ""
@@ -19824,4 +19869,5 @@
 #. item "Highways/Streets/Bridge" combo "Incline" display value
 #. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Highways/Streets/Ford" combo "Incline" display value
 #. item "Ways/Track" combo "Incline" display value
 #. item "Ways/Path" combo "Incline" display value
@@ -19839,8 +19885,9 @@
 #: build/trans_presets.java:435 build/trans_presets.java:491
 #: build/trans_presets.java:508 build/trans_presets.java:523
-#: build/trans_presets.java:551 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:643
-#: build/trans_presets.java:667 build/trans_presets.java:692
-#: build/trans_presets.java:712 build/trans_presets.java:1402
+#: build/trans_presets.java:533 build/trans_presets.java:561
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:653 build/trans_presets.java:677
+#: build/trans_presets.java:702 build/trans_presets.java:722
+#: build/trans_presets.java:1401
 msgid "-10°"
 msgstr ""
@@ -19913,5 +19960,5 @@
 #. item "Ways/Dedicated Footway" check "Passing Places"
 #: build/trans_presets.java:288 build/trans_presets.java:373
-#: build/trans_presets.java:689 build/trans_presets.java:709
+#: build/trans_presets.java:699 build/trans_presets.java:719
 msgid "Passing Places"
 msgstr ""
@@ -19943,10 +19990,10 @@
 #: build/trans_presets.java:434 build/trans_presets.java:490
 #: build/trans_presets.java:507 build/trans_presets.java:522
-#: build/trans_presets.java:550 build/trans_presets.java:587
-#: build/trans_presets.java:608 build/trans_presets.java:642
-#: build/trans_presets.java:666 build/trans_presets.java:691
-#: build/trans_presets.java:711 build/trans_presets.java:732
-#: build/trans_presets.java:1401 build/trans_presets.java:1799
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:560 build/trans_presets.java:597
+#: build/trans_presets.java:618 build/trans_presets.java:652
+#: build/trans_presets.java:676 build/trans_presets.java:701
+#: build/trans_presets.java:721 build/trans_presets.java:742
+#: build/trans_presets.java:1400 build/trans_presets.java:1800
+#: build/trans_presets.java:1845
 msgid "Width (meters)"
 msgstr ""
@@ -19988,9 +20035,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "Surface"
 msgstr ""
@@ -20015,9 +20062,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "paved"
 msgstr ""
@@ -20041,9 +20088,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398
 msgid "unpaved"
 msgstr ""
@@ -20067,9 +20114,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398
 msgid "asphalt"
 msgstr ""
@@ -20094,9 +20141,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "concrete"
 msgstr ""
@@ -20121,9 +20168,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399 build/trans_presets.java:2707
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398 build/trans_presets.java:2708
 msgid "metal"
 msgstr ""
@@ -20143,4 +20190,5 @@
 #. item "Ways/Dedicated Footway" combo "Surface" display value
 #. item "Ways/Steps" combo "Surface" display value
+#. item "Barriers/Fence" combo "Type" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Leisure/Public Grill" combo "Fuel" display value
@@ -20149,10 +20197,10 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399 build/trans_presets.java:2397
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:955 build/trans_presets.java:1398
+#: build/trans_presets.java:2398 build/trans_presets.java:2708
 msgid "wood"
 msgstr "غابة/حرش"
@@ -20176,9 +20224,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398
 msgid "paving_stones"
 msgstr ""
@@ -20203,9 +20251,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "cobblestone"
 msgstr ""
@@ -20230,9 +20278,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "gravel"
 msgstr ""
@@ -20256,9 +20304,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398
 msgid "pebblestone"
 msgstr ""
@@ -20282,9 +20330,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398
 msgid "compacted"
 msgstr ""
@@ -20308,9 +20356,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:570
-#: build/trans_presets.java:599 build/trans_presets.java:633
-#: build/trans_presets.java:658 build/trans_presets.java:682
-#: build/trans_presets.java:703 build/trans_presets.java:724
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:580
+#: build/trans_presets.java:609 build/trans_presets.java:643
+#: build/trans_presets.java:668 build/trans_presets.java:692
+#: build/trans_presets.java:713 build/trans_presets.java:734
+#: build/trans_presets.java:1398
 msgid "grass_paver"
 msgstr ""
@@ -20335,9 +20383,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "grass"
 msgstr ""
@@ -20362,9 +20410,9 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
 msgid "sand"
 msgstr ""
@@ -20390,10 +20438,10 @@
 #: build/trans_presets.java:353 build/trans_presets.java:375
 #: build/trans_presets.java:391 build/trans_presets.java:410
-#: build/trans_presets.java:431 build/trans_presets.java:537
-#: build/trans_presets.java:570 build/trans_presets.java:599
-#: build/trans_presets.java:633 build/trans_presets.java:658
-#: build/trans_presets.java:682 build/trans_presets.java:703
-#: build/trans_presets.java:724 build/trans_presets.java:1399
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:431 build/trans_presets.java:547
+#: build/trans_presets.java:580 build/trans_presets.java:609
+#: build/trans_presets.java:643 build/trans_presets.java:668
+#: build/trans_presets.java:692 build/trans_presets.java:713
+#: build/trans_presets.java:734 build/trans_presets.java:1398
+#: build/trans_presets.java:2677
 msgid "ground"
 msgstr ""
@@ -20544,5 +20592,5 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:432 build/trans_style.java:744
+#: build/trans_presets.java:432 build/trans_style.java:738
 msgid "roundabout"
 msgstr ""
@@ -20696,64 +20744,64 @@
 #: build/trans_presets.java:460 build/trans_presets.java:461
 #: build/trans_presets.java:462 build/trans_presets.java:501
-#: build/trans_presets.java:546 build/trans_presets.java:547
-#: build/trans_presets.java:548 build/trans_presets.java:549
-#: build/trans_presets.java:578 build/trans_presets.java:579
-#: build/trans_presets.java:580 build/trans_presets.java:581
-#: build/trans_presets.java:582 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:640
-#: build/trans_presets.java:808 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369 build/trans_presets.java:1381
-#: build/trans_presets.java:1593 build/trans_presets.java:1594
-#: build/trans_presets.java:1597 build/trans_presets.java:1598
-#: build/trans_presets.java:1599 build/trans_presets.java:1614
-#: build/trans_presets.java:1706 build/trans_presets.java:1718
-#: build/trans_presets.java:1719 build/trans_presets.java:1720
-#: build/trans_presets.java:1721 build/trans_presets.java:1722
-#: build/trans_presets.java:1833 build/trans_presets.java:1834
-#: build/trans_presets.java:1835 build/trans_presets.java:1953
-#: build/trans_presets.java:1954 build/trans_presets.java:1955
-#: build/trans_presets.java:1956 build/trans_presets.java:1971
-#: build/trans_presets.java:1972 build/trans_presets.java:1973
-#: build/trans_presets.java:1974 build/trans_presets.java:1987
-#: build/trans_presets.java:1988 build/trans_presets.java:1989
-#: build/trans_presets.java:1990 build/trans_presets.java:2004
-#: build/trans_presets.java:2005 build/trans_presets.java:2006
-#: build/trans_presets.java:2007 build/trans_presets.java:2022
-#: build/trans_presets.java:2023 build/trans_presets.java:2024
-#: build/trans_presets.java:2025 build/trans_presets.java:2039
-#: build/trans_presets.java:2040 build/trans_presets.java:2041
-#: build/trans_presets.java:2042 build/trans_presets.java:2056
-#: build/trans_presets.java:2057 build/trans_presets.java:2058
-#: build/trans_presets.java:2059 build/trans_presets.java:2062
-#: build/trans_presets.java:2078 build/trans_presets.java:2079
-#: build/trans_presets.java:2080 build/trans_presets.java:2081
-#: build/trans_presets.java:2101 build/trans_presets.java:2102
-#: build/trans_presets.java:2103 build/trans_presets.java:2104
-#: build/trans_presets.java:2120 build/trans_presets.java:2121
-#: build/trans_presets.java:2122 build/trans_presets.java:2123
-#: build/trans_presets.java:2137 build/trans_presets.java:2138
-#: build/trans_presets.java:2139 build/trans_presets.java:2140
-#: build/trans_presets.java:2156 build/trans_presets.java:2157
-#: build/trans_presets.java:2158 build/trans_presets.java:2159
-#: build/trans_presets.java:2175 build/trans_presets.java:2176
-#: build/trans_presets.java:2177 build/trans_presets.java:2178
-#: build/trans_presets.java:2191 build/trans_presets.java:2192
-#: build/trans_presets.java:2193 build/trans_presets.java:2194
-#: build/trans_presets.java:2208 build/trans_presets.java:2209
-#: build/trans_presets.java:2210 build/trans_presets.java:2211
-#: build/trans_presets.java:2225 build/trans_presets.java:2226
-#: build/trans_presets.java:2304 build/trans_presets.java:2314
-#: build/trans_presets.java:2375 build/trans_presets.java:2396
-#: build/trans_presets.java:2595 build/trans_presets.java:2647
-#: build/trans_presets.java:2648 build/trans_presets.java:2706
-#: build/trans_presets.java:2722 build/trans_presets.java:2723
-#: build/trans_presets.java:2724 build/trans_presets.java:3155
-#: build/trans_presets.java:3267 build/trans_presets.java:3268
-#: build/trans_presets.java:3269 build/trans_presets.java:3270
-#: build/trans_presets.java:3271 build/trans_presets.java:3272
-#: build/trans_presets.java:3273 build/trans_presets.java:3274
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:556 build/trans_presets.java:557
+#: build/trans_presets.java:558 build/trans_presets.java:559
+#: build/trans_presets.java:588 build/trans_presets.java:589
+#: build/trans_presets.java:590 build/trans_presets.java:591
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:650
+#: build/trans_presets.java:818 build/trans_presets.java:1308
+#: build/trans_presets.java:1320 build/trans_presets.java:1332
+#: build/trans_presets.java:1344 build/trans_presets.java:1356
+#: build/trans_presets.java:1368 build/trans_presets.java:1380
+#: build/trans_presets.java:1592 build/trans_presets.java:1593
+#: build/trans_presets.java:1596 build/trans_presets.java:1597
+#: build/trans_presets.java:1598 build/trans_presets.java:1613
+#: build/trans_presets.java:1705 build/trans_presets.java:1717
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1834 build/trans_presets.java:1835
+#: build/trans_presets.java:1836 build/trans_presets.java:1954
+#: build/trans_presets.java:1955 build/trans_presets.java:1956
+#: build/trans_presets.java:1957 build/trans_presets.java:1972
+#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#: build/trans_presets.java:1975 build/trans_presets.java:1988
+#: build/trans_presets.java:1989 build/trans_presets.java:1990
+#: build/trans_presets.java:1991 build/trans_presets.java:2005
+#: build/trans_presets.java:2006 build/trans_presets.java:2007
+#: build/trans_presets.java:2008 build/trans_presets.java:2023
+#: build/trans_presets.java:2024 build/trans_presets.java:2025
+#: build/trans_presets.java:2026 build/trans_presets.java:2040
+#: build/trans_presets.java:2041 build/trans_presets.java:2042
+#: build/trans_presets.java:2043 build/trans_presets.java:2057
+#: build/trans_presets.java:2058 build/trans_presets.java:2059
+#: build/trans_presets.java:2060 build/trans_presets.java:2063
+#: build/trans_presets.java:2079 build/trans_presets.java:2080
+#: build/trans_presets.java:2081 build/trans_presets.java:2082
+#: build/trans_presets.java:2102 build/trans_presets.java:2103
+#: build/trans_presets.java:2104 build/trans_presets.java:2105
+#: build/trans_presets.java:2121 build/trans_presets.java:2122
+#: build/trans_presets.java:2123 build/trans_presets.java:2124
+#: build/trans_presets.java:2138 build/trans_presets.java:2139
+#: build/trans_presets.java:2140 build/trans_presets.java:2141
+#: build/trans_presets.java:2157 build/trans_presets.java:2158
+#: build/trans_presets.java:2159 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2177
+#: build/trans_presets.java:2178 build/trans_presets.java:2179
+#: build/trans_presets.java:2192 build/trans_presets.java:2193
+#: build/trans_presets.java:2194 build/trans_presets.java:2195
+#: build/trans_presets.java:2209 build/trans_presets.java:2210
+#: build/trans_presets.java:2211 build/trans_presets.java:2212
+#: build/trans_presets.java:2226 build/trans_presets.java:2227
+#: build/trans_presets.java:2305 build/trans_presets.java:2315
+#: build/trans_presets.java:2376 build/trans_presets.java:2397
+#: build/trans_presets.java:2596 build/trans_presets.java:2648
+#: build/trans_presets.java:2649 build/trans_presets.java:2707
+#: build/trans_presets.java:2723 build/trans_presets.java:2724
+#: build/trans_presets.java:2725 build/trans_presets.java:3156
+#: build/trans_presets.java:3268 build/trans_presets.java:3269
+#: build/trans_presets.java:3270 build/trans_presets.java:3271
+#: build/trans_presets.java:3272 build/trans_presets.java:3273
+#: build/trans_presets.java:3274 build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -20829,8 +20877,8 @@
 #: build/trans_presets.java:459 build/trans_presets.java:460
 #: build/trans_presets.java:461 build/trans_presets.java:462
-#: build/trans_presets.java:546 build/trans_presets.java:547
-#: build/trans_presets.java:548 build/trans_presets.java:549
-#: build/trans_presets.java:578 build/trans_presets.java:579
-#: build/trans_presets.java:580 build/trans_presets.java:583
+#: build/trans_presets.java:556 build/trans_presets.java:557
+#: build/trans_presets.java:558 build/trans_presets.java:559
+#: build/trans_presets.java:588 build/trans_presets.java:589
+#: build/trans_presets.java:590 build/trans_presets.java:593
 #: build/trans_style.java:179
 msgid "destination"
@@ -20860,8 +20908,8 @@
 #: build/trans_presets.java:454 build/trans_presets.java:455
 #: build/trans_presets.java:456 build/trans_presets.java:457
-#: build/trans_presets.java:546 build/trans_presets.java:547
-#: build/trans_presets.java:548 build/trans_presets.java:549
-#: build/trans_presets.java:578 build/trans_presets.java:579
-#: build/trans_presets.java:580 build/trans_presets.java:583
+#: build/trans_presets.java:556 build/trans_presets.java:557
+#: build/trans_presets.java:558 build/trans_presets.java:559
+#: build/trans_presets.java:588 build/trans_presets.java:589
+#: build/trans_presets.java:590 build/trans_presets.java:593
 msgid "delivery"
 msgstr ""
@@ -20911,9 +20959,9 @@
 #: build/trans_presets.java:459 build/trans_presets.java:460
 #: build/trans_presets.java:461 build/trans_presets.java:462
-#: build/trans_presets.java:546 build/trans_presets.java:547
-#: build/trans_presets.java:548 build/trans_presets.java:549
-#: build/trans_presets.java:578 build/trans_presets.java:579
-#: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2375
+#: build/trans_presets.java:556 build/trans_presets.java:557
+#: build/trans_presets.java:558 build/trans_presets.java:559
+#: build/trans_presets.java:588 build/trans_presets.java:589
+#: build/trans_presets.java:590 build/trans_presets.java:592
+#: build/trans_presets.java:593 build/trans_presets.java:2376
 #: build/trans_style.java:169
 msgid "permissive"
@@ -20956,9 +21004,9 @@
 #: build/trans_presets.java:459 build/trans_presets.java:460
 #: build/trans_presets.java:461 build/trans_presets.java:462
-#: build/trans_presets.java:546 build/trans_presets.java:547
-#: build/trans_presets.java:548 build/trans_presets.java:549
-#: build/trans_presets.java:578 build/trans_presets.java:579
-#: build/trans_presets.java:580 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:2375
+#: build/trans_presets.java:556 build/trans_presets.java:557
+#: build/trans_presets.java:558 build/trans_presets.java:559
+#: build/trans_presets.java:588 build/trans_presets.java:589
+#: build/trans_presets.java:590 build/trans_presets.java:592
+#: build/trans_presets.java:593 build/trans_presets.java:2376
 #: build/trans_style.java:174
 msgid "private"
@@ -20979,7 +21027,7 @@
 #: build/trans_presets.java:453 build/trans_presets.java:454
 #: build/trans_presets.java:455 build/trans_presets.java:456
-#: build/trans_presets.java:457 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549
+#: build/trans_presets.java:457 build/trans_presets.java:556
+#: build/trans_presets.java:557 build/trans_presets.java:558
+#: build/trans_presets.java:559
 msgid "agricultural"
 msgstr ""
@@ -20999,7 +21047,7 @@
 #: build/trans_presets.java:453 build/trans_presets.java:454
 #: build/trans_presets.java:455 build/trans_presets.java:456
-#: build/trans_presets.java:457 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549
+#: build/trans_presets.java:457 build/trans_presets.java:556
+#: build/trans_presets.java:557 build/trans_presets.java:558
+#: build/trans_presets.java:559
 msgid "forestry"
 msgstr ""
@@ -21139,61 +21187,61 @@
 #: build/trans_presets.java:459 build/trans_presets.java:460
 #: build/trans_presets.java:461 build/trans_presets.java:462
-#: build/trans_presets.java:546 build/trans_presets.java:547
-#: build/trans_presets.java:548 build/trans_presets.java:549
-#: build/trans_presets.java:571 build/trans_presets.java:578
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:582
-#: build/trans_presets.java:583 build/trans_presets.java:584
-#: build/trans_presets.java:640 build/trans_presets.java:777
-#: build/trans_presets.java:799 build/trans_presets.java:1309
-#: build/trans_presets.java:1321 build/trans_presets.java:1333
-#: build/trans_presets.java:1345 build/trans_presets.java:1357
-#: build/trans_presets.java:1369 build/trans_presets.java:1381
-#: build/trans_presets.java:1424 build/trans_presets.java:1593
-#: build/trans_presets.java:1594 build/trans_presets.java:1597
-#: build/trans_presets.java:1598 build/trans_presets.java:1599
-#: build/trans_presets.java:1614 build/trans_presets.java:1706
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1720 build/trans_presets.java:1721
-#: build/trans_presets.java:1722 build/trans_presets.java:1833
-#: build/trans_presets.java:1834 build/trans_presets.java:1835
-#: build/trans_presets.java:1953 build/trans_presets.java:1954
-#: build/trans_presets.java:1955 build/trans_presets.java:1956
-#: build/trans_presets.java:1971 build/trans_presets.java:1972
-#: build/trans_presets.java:1973 build/trans_presets.java:1974
-#: build/trans_presets.java:1987 build/trans_presets.java:1988
-#: build/trans_presets.java:1989 build/trans_presets.java:1990
-#: build/trans_presets.java:2004 build/trans_presets.java:2005
-#: build/trans_presets.java:2006 build/trans_presets.java:2007
-#: build/trans_presets.java:2022 build/trans_presets.java:2023
-#: build/trans_presets.java:2024 build/trans_presets.java:2025
-#: build/trans_presets.java:2039 build/trans_presets.java:2040
-#: build/trans_presets.java:2041 build/trans_presets.java:2042
-#: build/trans_presets.java:2056 build/trans_presets.java:2057
-#: build/trans_presets.java:2058 build/trans_presets.java:2059
-#: build/trans_presets.java:2062 build/trans_presets.java:2078
-#: build/trans_presets.java:2079 build/trans_presets.java:2080
-#: build/trans_presets.java:2081 build/trans_presets.java:2101
-#: build/trans_presets.java:2102 build/trans_presets.java:2103
-#: build/trans_presets.java:2104 build/trans_presets.java:2120
-#: build/trans_presets.java:2121 build/trans_presets.java:2122
-#: build/trans_presets.java:2123 build/trans_presets.java:2137
-#: build/trans_presets.java:2138 build/trans_presets.java:2139
-#: build/trans_presets.java:2140 build/trans_presets.java:2156
-#: build/trans_presets.java:2157 build/trans_presets.java:2158
-#: build/trans_presets.java:2159 build/trans_presets.java:2175
-#: build/trans_presets.java:2176 build/trans_presets.java:2177
-#: build/trans_presets.java:2178 build/trans_presets.java:2191
-#: build/trans_presets.java:2192 build/trans_presets.java:2193
-#: build/trans_presets.java:2194 build/trans_presets.java:2208
-#: build/trans_presets.java:2209 build/trans_presets.java:2210
-#: build/trans_presets.java:2211 build/trans_presets.java:2225
-#: build/trans_presets.java:2226 build/trans_presets.java:2304
-#: build/trans_presets.java:2314 build/trans_presets.java:2396
-#: build/trans_presets.java:2595 build/trans_presets.java:2647
-#: build/trans_presets.java:2648 build/trans_presets.java:2706
-#: build/trans_presets.java:2722 build/trans_presets.java:2723
-#: build/trans_presets.java:2724 build/trans_presets.java:3155
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:556 build/trans_presets.java:557
+#: build/trans_presets.java:558 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:592
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:650 build/trans_presets.java:787
+#: build/trans_presets.java:809 build/trans_presets.java:1308
+#: build/trans_presets.java:1320 build/trans_presets.java:1332
+#: build/trans_presets.java:1344 build/trans_presets.java:1356
+#: build/trans_presets.java:1368 build/trans_presets.java:1380
+#: build/trans_presets.java:1423 build/trans_presets.java:1592
+#: build/trans_presets.java:1593 build/trans_presets.java:1596
+#: build/trans_presets.java:1597 build/trans_presets.java:1598
+#: build/trans_presets.java:1613 build/trans_presets.java:1705
+#: build/trans_presets.java:1717 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1834
+#: build/trans_presets.java:1835 build/trans_presets.java:1836
+#: build/trans_presets.java:1954 build/trans_presets.java:1955
+#: build/trans_presets.java:1956 build/trans_presets.java:1957
+#: build/trans_presets.java:1972 build/trans_presets.java:1973
+#: build/trans_presets.java:1974 build/trans_presets.java:1975
+#: build/trans_presets.java:1988 build/trans_presets.java:1989
+#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:2005 build/trans_presets.java:2006
+#: build/trans_presets.java:2007 build/trans_presets.java:2008
+#: build/trans_presets.java:2023 build/trans_presets.java:2024
+#: build/trans_presets.java:2025 build/trans_presets.java:2026
+#: build/trans_presets.java:2040 build/trans_presets.java:2041
+#: build/trans_presets.java:2042 build/trans_presets.java:2043
+#: build/trans_presets.java:2057 build/trans_presets.java:2058
+#: build/trans_presets.java:2059 build/trans_presets.java:2060
+#: build/trans_presets.java:2063 build/trans_presets.java:2079
+#: build/trans_presets.java:2080 build/trans_presets.java:2081
+#: build/trans_presets.java:2082 build/trans_presets.java:2102
+#: build/trans_presets.java:2103 build/trans_presets.java:2104
+#: build/trans_presets.java:2105 build/trans_presets.java:2121
+#: build/trans_presets.java:2122 build/trans_presets.java:2123
+#: build/trans_presets.java:2124 build/trans_presets.java:2138
+#: build/trans_presets.java:2139 build/trans_presets.java:2140
+#: build/trans_presets.java:2141 build/trans_presets.java:2157
+#: build/trans_presets.java:2158 build/trans_presets.java:2159
+#: build/trans_presets.java:2160 build/trans_presets.java:2176
+#: build/trans_presets.java:2177 build/trans_presets.java:2178
+#: build/trans_presets.java:2179 build/trans_presets.java:2192
+#: build/trans_presets.java:2193 build/trans_presets.java:2194
+#: build/trans_presets.java:2195 build/trans_presets.java:2209
+#: build/trans_presets.java:2210 build/trans_presets.java:2211
+#: build/trans_presets.java:2212 build/trans_presets.java:2226
+#: build/trans_presets.java:2227 build/trans_presets.java:2305
+#: build/trans_presets.java:2315 build/trans_presets.java:2397
+#: build/trans_presets.java:2596 build/trans_presets.java:2648
+#: build/trans_presets.java:2649 build/trans_presets.java:2707
+#: build/trans_presets.java:2723 build/trans_presets.java:2724
+#: build/trans_presets.java:2725 build/trans_presets.java:3156
+#: build/trans_presets.java:3239
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -21227,10 +21275,10 @@
 #: build/trans_presets.java:457 build/trans_presets.java:459
 #: build/trans_presets.java:460 build/trans_presets.java:461
-#: build/trans_presets.java:462 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:578
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:581 build/trans_presets.java:582
-#: build/trans_presets.java:583
+#: build/trans_presets.java:462 build/trans_presets.java:556
+#: build/trans_presets.java:557 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:592
+#: build/trans_presets.java:593
 msgid "official"
 msgstr ""
@@ -21262,10 +21310,10 @@
 #: build/trans_presets.java:457 build/trans_presets.java:459
 #: build/trans_presets.java:460 build/trans_presets.java:461
-#: build/trans_presets.java:462 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:578
-#: build/trans_presets.java:579 build/trans_presets.java:580
-#: build/trans_presets.java:582 build/trans_presets.java:583
-#: build/trans_presets.java:584
+#: build/trans_presets.java:462 build/trans_presets.java:556
+#: build/trans_presets.java:557 build/trans_presets.java:558
+#: build/trans_presets.java:559 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594
 msgid "designated"
 msgstr ""
@@ -21284,11 +21332,11 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:449 build/trans_presets.java:580
-#: build/trans_presets.java:871 build/trans_presets.java:881
-#: build/trans_presets.java:890 build/trans_presets.java:916
-#: build/trans_presets.java:938 build/trans_presets.java:981
-#: build/trans_presets.java:994 build/trans_presets.java:1006
-#: build/trans_presets.java:1018 build/trans_presets.java:1030
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:449 build/trans_presets.java:590
+#: build/trans_presets.java:873 build/trans_presets.java:883
+#: build/trans_presets.java:892 build/trans_presets.java:918
+#: build/trans_presets.java:940 build/trans_presets.java:980
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1017 build/trans_presets.java:1029
+#: build/trans_presets.java:1069
 msgid "Horse"
 msgstr ""
@@ -21306,5 +21354,5 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motor vehicles"
 #. item "Ways/Track" combo "Motor vehicles"
-#: build/trans_presets.java:453 build/trans_presets.java:547
+#: build/trans_presets.java:453 build/trans_presets.java:557
 msgid "Motor vehicles"
 msgstr ""
@@ -21325,12 +21373,12 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: build/trans_presets.java:454 build/trans_presets.java:548
-#: build/trans_presets.java:872 build/trans_presets.java:882
-#: build/trans_presets.java:891 build/trans_presets.java:902
-#: build/trans_presets.java:917 build/trans_presets.java:939
-#: build/trans_presets.java:982 build/trans_presets.java:995
-#: build/trans_presets.java:1007 build/trans_presets.java:1019
-#: build/trans_presets.java:1031 build/trans_presets.java:1071
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:454 build/trans_presets.java:558
+#: build/trans_presets.java:874 build/trans_presets.java:884
+#: build/trans_presets.java:893 build/trans_presets.java:904
+#: build/trans_presets.java:919 build/trans_presets.java:941
+#: build/trans_presets.java:981 build/trans_presets.java:994
+#: build/trans_presets.java:1006 build/trans_presets.java:1018
+#: build/trans_presets.java:1030 build/trans_presets.java:1070
+#: build/trans_presets.java:1698
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
@@ -21348,10 +21396,10 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:455 build/trans_presets.java:549
-#: build/trans_presets.java:584 build/trans_presets.java:903
-#: build/trans_presets.java:918 build/trans_presets.java:940
-#: build/trans_presets.java:983 build/trans_presets.java:996
-#: build/trans_presets.java:1008 build/trans_presets.java:1020
-#: build/trans_presets.java:1032 build/trans_presets.java:1072
+#: build/trans_presets.java:455 build/trans_presets.java:559
+#: build/trans_presets.java:594 build/trans_presets.java:905
+#: build/trans_presets.java:920 build/trans_presets.java:942
+#: build/trans_presets.java:982 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1031 build/trans_presets.java:1071
 msgid "Motorcar"
 msgstr ""
@@ -21451,6 +21499,6 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:417 build/trans_style.java:423
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:411 build/trans_style.java:417
 msgid "motorway"
 msgstr ""
@@ -21458,5 +21506,5 @@
 #. item "Highways/Streets/Roundabout" combo "Type" display value
 #. item "Ways/Cycle Lane" combo "Highway" display value
-#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_presets.java:480 build/trans_presets.java:631
 msgid "motorway_link"
 msgstr ""
@@ -21476,6 +21524,6 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:429 build/trans_style.java:435
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:423 build/trans_style.java:429
 msgid "trunk"
 msgstr ""
@@ -21483,5 +21531,5 @@
 #. item "Highways/Streets/Roundabout" combo "Type" display value
 #. item "Ways/Cycle Lane" combo "Highway" display value
-#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_presets.java:480 build/trans_presets.java:631
 msgid "trunk_link"
 msgstr ""
@@ -21501,6 +21549,6 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:441 build/trans_style.java:447
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:435 build/trans_style.java:441
 msgid "primary"
 msgstr ""
@@ -21508,5 +21556,5 @@
 #. item "Highways/Streets/Roundabout" combo "Type" display value
 #. item "Ways/Cycle Lane" combo "Highway" display value
-#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_presets.java:480 build/trans_presets.java:631
 msgid "primary_link"
 msgstr ""
@@ -21526,6 +21574,6 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:453 build/trans_style.java:459
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:447 build/trans_style.java:453
 msgid "secondary"
 msgstr ""
@@ -21545,6 +21593,6 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:465 build/trans_style.java:471
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:459 build/trans_style.java:465
 msgid "tertiary"
 msgstr ""
@@ -21552,5 +21600,5 @@
 #. item "Highways/Streets/Roundabout" combo "Type" display value
 #. item "Ways/Cycle Lane" combo "Highway" display value
-#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_presets.java:480 build/trans_presets.java:631
 msgid "unclassified"
 msgstr ""
@@ -21564,6 +21612,6 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:2763
 msgid "residential"
 msgstr ""
@@ -21571,5 +21619,5 @@
 #. item "Highways/Streets/Roundabout" combo "Type" display value
 #. item "Ways/Cycle Lane" combo "Highway" display value
-#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_presets.java:480 build/trans_presets.java:631
 msgid "living_street"
 msgstr "شارع سكني"
@@ -21610,6 +21658,6 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:513 build/trans_style.java:3662
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:507 build/trans_style.java:3677
 msgid "service"
 msgstr ""
@@ -21617,5 +21665,5 @@
 #. item "Highways/Streets/Roundabout" combo "Type" display value
 #. item "Ways/Cycle Lane" combo "Highway" display value
-#: build/trans_presets.java:480 build/trans_presets.java:621
+#: build/trans_presets.java:480 build/trans_presets.java:631
 msgid "bus_guideway"
 msgstr ""
@@ -21640,7 +21688,7 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:480 build/trans_presets.java:621
-#: build/trans_style.java:698 build/trans_style.java:2803
-#: build/trans_style.java:2804
+#: build/trans_presets.java:480 build/trans_presets.java:631
+#: build/trans_style.java:692 build/trans_style.java:2818
+#: build/trans_style.java:2819
 msgid "construction"
 msgstr ""
@@ -21676,11 +21724,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "مخاضة"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "حرر المخاضة"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr ""
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr ""
@@ -21689,35 +21748,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:531
+#: build/trans_presets.java:541
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade1"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade2"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade3"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade4"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade5"
 msgstr ""
@@ -21725,10 +21784,10 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:538 build/trans_presets.java:569
+#: build/trans_presets.java:548 build/trans_presets.java:579
 msgid "MTB Scale"
 msgstr ""
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:546
+#: build/trans_presets.java:556
 msgid "General access"
 msgstr ""
@@ -21736,5 +21795,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr ""
@@ -21743,50 +21802,50 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:557
+#: build/trans_presets.java:567
 msgid "Edit Path"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "SAC Scale"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T1 - hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T2 - mountain hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T3 - difficult, exposed hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T4 - difficult, exposed, steep alpine trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T5 - difficult alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
-#: build/trans_presets.java:563
+#: build/trans_presets.java:573
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description
-#: build/trans_presets.java:564
+#: build/trans_presets.java:574
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -21795,5 +21854,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
-#: build/trans_presets.java:565
+#: build/trans_presets.java:575
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -21803,5 +21862,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
-#: build/trans_presets.java:566
+#: build/trans_presets.java:576
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -21810,5 +21869,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
-#: build/trans_presets.java:567
+#: build/trans_presets.java:577
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -21817,5 +21876,5 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description
-#: build/trans_presets.java:568
+#: build/trans_presets.java:578
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -21825,5 +21884,5 @@
 #. item "Ways/Path" combo "Visibility"
 #. visibilty
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125
 msgid "Visibility"
@@ -21831,10 +21890,10 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "excellent"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "good"
 msgstr ""
@@ -21842,15 +21901,15 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:571 build/trans_presets.java:2894
+#: build/trans_presets.java:581 build/trans_presets.java:2895
 msgid "intermediate"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "bad"
 msgstr ""
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "horrible"
 msgstr ""
@@ -21873,23 +21932,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1956
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007 build/trans_presets.java:2025
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2081 build/trans_presets.java:2104
-#: build/trans_presets.java:2123 build/trans_presets.java:2140
-#: build/trans_presets.java:2159 build/trans_presets.java:2178
-#: build/trans_presets.java:2194 build/trans_presets.java:2211
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:591 build/trans_presets.java:1957
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2060
+#: build/trans_presets.java:2082 build/trans_presets.java:2105
+#: build/trans_presets.java:2124 build/trans_presets.java:2141
+#: build/trans_presets.java:2160 build/trans_presets.java:2179
+#: build/trans_presets.java:2195 build/trans_presets.java:2212
+#: build/trans_presets.java:2227
 msgid "Wheelchairs"
 msgstr ""
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:582
+#: build/trans_presets.java:592
 msgid "Ski"
 msgstr ""
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr ""
@@ -21898,5 +21957,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21904,5 +21963,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:604
 msgid "Edit Bridleway"
 msgstr ""
@@ -21910,5 +21969,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -21916,10 +21975,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Bicycle" />
 #. item "Ways/Cycle Lane" label "Edit Cycle Lane"
-#: build/trans_presets.java:614
+#: build/trans_presets.java:624
 msgid "Edit Cycle Lane"
 msgstr ""
 
 #. item "Ways/Cycle Lane" combo "Cycleway"
-#: build/trans_presets.java:615
+#: build/trans_presets.java:625
 msgid "Cycleway"
 msgstr ""
@@ -21928,6 +21987,6 @@
 #. item "Ways/Cycle Lane" combo "Cycleway left" display value
 #. item "Ways/Cycle Lane" combo "Cycleway right" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627
 msgid "lane"
 msgstr ""
@@ -21978,27 +22037,27 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617 build/trans_presets.java:2808
-#: build/trans_presets.java:2814 build/trans_presets.java:2820
-#: build/trans_presets.java:2826 build/trans_presets.java:2832
-#: build/trans_presets.java:2838 build/trans_presets.java:2844
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2886 build/trans_presets.java:2895
-#: build/trans_presets.java:2902 build/trans_presets.java:2910
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2928 build/trans_presets.java:2934
-#: build/trans_presets.java:2940 build/trans_presets.java:2946
-#: build/trans_presets.java:2952 build/trans_presets.java:2958
-#: build/trans_presets.java:2982 build/trans_presets.java:2988
-#: build/trans_presets.java:2994 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3012
-#: build/trans_presets.java:3018 build/trans_presets.java:3024
-#: build/trans_presets.java:3030 build/trans_presets.java:3036
-#: build/trans_presets.java:3042 build/trans_presets.java:3050
-#: build/trans_presets.java:3056 build/trans_presets.java:3062
-#: build/trans_presets.java:3068 build/trans_presets.java:3075
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2857
+#: build/trans_presets.java:2863 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2881
+#: build/trans_presets.java:2887 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2911
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2941 build/trans_presets.java:2947
+#: build/trans_presets.java:2953 build/trans_presets.java:2959
+#: build/trans_presets.java:2983 build/trans_presets.java:2989
+#: build/trans_presets.java:2995 build/trans_presets.java:3001
+#: build/trans_presets.java:3007 build/trans_presets.java:3013
+#: build/trans_presets.java:3019 build/trans_presets.java:3025
+#: build/trans_presets.java:3031 build/trans_presets.java:3037
+#: build/trans_presets.java:3043 build/trans_presets.java:3051
+#: build/trans_presets.java:3057 build/trans_presets.java:3063
+#: build/trans_presets.java:3069 build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "track"
 msgstr ""
@@ -22007,6 +22066,6 @@
 #. item "Ways/Cycle Lane" combo "Cycleway left" display value
 #. item "Ways/Cycle Lane" combo "Cycleway right" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627
 msgid "opposite_lane"
 msgstr ""
@@ -22015,6 +22074,6 @@
 #. item "Ways/Cycle Lane" combo "Cycleway left" display value
 #. item "Ways/Cycle Lane" combo "Cycleway right" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627
 msgid "opposite_track"
 msgstr ""
@@ -22023,6 +22082,6 @@
 #. item "Ways/Cycle Lane" combo "Cycleway left" display value
 #. item "Ways/Cycle Lane" combo "Cycleway right" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627
 msgid "opposite"
 msgstr ""
@@ -22031,6 +22090,6 @@
 #. item "Ways/Cycle Lane" combo "Cycleway left" display value
 #. item "Ways/Cycle Lane" combo "Cycleway right" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627
 msgid "share_busway"
 msgstr ""
@@ -22039,21 +22098,21 @@
 #. item "Ways/Cycle Lane" combo "Cycleway left" display value
 #. item "Ways/Cycle Lane" combo "Cycleway right" display value
-#: build/trans_presets.java:615 build/trans_presets.java:616
-#: build/trans_presets.java:617
+#: build/trans_presets.java:625 build/trans_presets.java:626
+#: build/trans_presets.java:627
 msgid "shared_lane"
 msgstr ""
 
 #. item "Ways/Cycle Lane" combo "Cycleway left"
-#: build/trans_presets.java:616
+#: build/trans_presets.java:626
 msgid "Cycleway left"
 msgstr ""
 
 #. item "Ways/Cycle Lane" combo "Cycleway right"
-#: build/trans_presets.java:617
+#: build/trans_presets.java:627
 msgid "Cycleway right"
 msgstr ""
 
 #. item "Ways/Cycle Lane" check "Oneway (bicycle)"
-#: build/trans_presets.java:618
+#: build/trans_presets.java:628
 msgid "Oneway (bicycle)"
 msgstr ""
@@ -22061,15 +22120,15 @@
 #. <space />
 #. item "Ways/Cycle Lane" label "Edit Highway"
-#: build/trans_presets.java:620
+#: build/trans_presets.java:630
 msgid "Edit Highway"
 msgstr ""
 
 #. item "Ways/Cycle Lane" combo "Highway"
-#: build/trans_presets.java:621
+#: build/trans_presets.java:631
 msgid "Highway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:624
+#: build/trans_presets.java:634
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -22087,11 +22146,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:628 build/trans_presets.java:650
-#: build/trans_presets.java:674
+#: build/trans_presets.java:638 build/trans_presets.java:660
+#: build/trans_presets.java:684
 msgid "Edit Cycleway"
 msgstr "حرّر طريق للدراجات"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr ""
@@ -22099,5 +22158,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22105,5 +22164,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22111,5 +22170,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr ""
@@ -22118,5 +22177,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:698
+#: build/trans_presets.java:708
 msgid "Edit Footway"
 msgstr "حرّر طريق قدم"
@@ -22124,5 +22183,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "درجات"
@@ -22132,10 +22191,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:719
+#: build/trans_presets.java:729
 msgid "Edit Flight of Steps"
 msgstr ""
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr ""
@@ -22143,5 +22202,5 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:747
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -22149,5 +22208,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr "تقاطع طرقات سريعة"
@@ -22155,10 +22214,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:740
+#: build/trans_presets.java:750
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:744
+#: build/trans_presets.java:754
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22167,10 +22226,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:745
+#: build/trans_presets.java:755
 msgid "Exit to"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:747
+#: build/trans_presets.java:757
 msgid "Services"
 msgstr "الخدمات"
@@ -22178,5 +22237,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:759
 msgid "Edit Service Station"
 msgstr "حرّر محطة خدمات"
@@ -22270,42 +22329,42 @@
 #. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:754 build/trans_presets.java:927
-#: build/trans_presets.java:1612 build/trans_presets.java:1636
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
-#: build/trans_presets.java:1661 build/trans_presets.java:1669
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1714 build/trans_presets.java:1853
-#: build/trans_presets.java:1950 build/trans_presets.java:1968
-#: build/trans_presets.java:2019 build/trans_presets.java:2036
-#: build/trans_presets.java:2095 build/trans_presets.java:2116
-#: build/trans_presets.java:2152 build/trans_presets.java:2171
-#: build/trans_presets.java:2302 build/trans_presets.java:2312
-#: build/trans_presets.java:2373 build/trans_presets.java:2459
-#: build/trans_presets.java:2484 build/trans_presets.java:2527
-#: build/trans_presets.java:2560 build/trans_presets.java:2588
-#: build/trans_presets.java:2605 build/trans_presets.java:2613
-#: build/trans_presets.java:2625 build/trans_presets.java:2645
-#: build/trans_presets.java:2654 build/trans_presets.java:2661
-#: build/trans_presets.java:2744 build/trans_presets.java:2966
-#: build/trans_presets.java:2975 build/trans_presets.java:3097
-#: build/trans_presets.java:3116 build/trans_presets.java:3135
-#: build/trans_presets.java:3153 build/trans_presets.java:3164
-#: build/trans_presets.java:3180 build/trans_presets.java:3236
-#: build/trans_presets.java:3283 build/trans_presets.java:3291
-#: build/trans_presets.java:3299 build/trans_presets.java:3324
-#: build/trans_presets.java:3439 build/trans_presets.java:3448
-#: build/trans_presets.java:3465 build/trans_presets.java:3474
-#: build/trans_presets.java:3511 build/trans_presets.java:3560
-#: build/trans_presets.java:3583 build/trans_presets.java:3592
-#: build/trans_presets.java:3614 build/trans_presets.java:3629
-#: build/trans_presets.java:3639 build/trans_presets.java:3648
-#: build/trans_presets.java:3676 build/trans_presets.java:3685
-#: build/trans_presets.java:3724 build/trans_presets.java:3740
-#: build/trans_presets.java:3749 build/trans_presets.java:3758
-#: build/trans_presets.java:3774 build/trans_presets.java:3796
-#: build/trans_presets.java:3811 build/trans_presets.java:3820
-#: build/trans_presets.java:4095 build/trans_presets.java:4188
-#: build/trans_presets.java:4337 build/trans_presets.java:4367
-#: build/trans_presets.java:4389
+#: build/trans_presets.java:764 build/trans_presets.java:929
+#: build/trans_presets.java:1611 build/trans_presets.java:1635
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1668
+#: build/trans_presets.java:1684 build/trans_presets.java:1691
+#: build/trans_presets.java:1713 build/trans_presets.java:1854
+#: build/trans_presets.java:1951 build/trans_presets.java:1969
+#: build/trans_presets.java:2020 build/trans_presets.java:2037
+#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2153 build/trans_presets.java:2172
+#: build/trans_presets.java:2303 build/trans_presets.java:2313
+#: build/trans_presets.java:2374 build/trans_presets.java:2460
+#: build/trans_presets.java:2485 build/trans_presets.java:2528
+#: build/trans_presets.java:2561 build/trans_presets.java:2589
+#: build/trans_presets.java:2606 build/trans_presets.java:2614
+#: build/trans_presets.java:2626 build/trans_presets.java:2646
+#: build/trans_presets.java:2655 build/trans_presets.java:2662
+#: build/trans_presets.java:2745 build/trans_presets.java:2967
+#: build/trans_presets.java:2976 build/trans_presets.java:3098
+#: build/trans_presets.java:3117 build/trans_presets.java:3136
+#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3181 build/trans_presets.java:3237
+#: build/trans_presets.java:3284 build/trans_presets.java:3292
+#: build/trans_presets.java:3300 build/trans_presets.java:3325
+#: build/trans_presets.java:3440 build/trans_presets.java:3449
+#: build/trans_presets.java:3466 build/trans_presets.java:3475
+#: build/trans_presets.java:3512 build/trans_presets.java:3561
+#: build/trans_presets.java:3584 build/trans_presets.java:3593
+#: build/trans_presets.java:3615 build/trans_presets.java:3630
+#: build/trans_presets.java:3640 build/trans_presets.java:3649
+#: build/trans_presets.java:3677 build/trans_presets.java:3686
+#: build/trans_presets.java:3725 build/trans_presets.java:3741
+#: build/trans_presets.java:3750 build/trans_presets.java:3759
+#: build/trans_presets.java:3775 build/trans_presets.java:3797
+#: build/trans_presets.java:3812 build/trans_presets.java:3821
+#: build/trans_presets.java:4096 build/trans_presets.java:4189
+#: build/trans_presets.java:4339 build/trans_presets.java:4369
+#: build/trans_presets.java:4391
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -22314,6 +22373,6 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:755 build/trans_presets.java:765
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:765 build/trans_presets.java:775
+#: build/trans_presets.java:2642
 msgid "Toilets"
 msgstr "مراحيض"
@@ -22321,5 +22380,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -22327,5 +22386,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:760
+#: build/trans_presets.java:770
 msgid "Edit Rest Area"
 msgstr ""
@@ -22333,5 +22392,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "هاتف طوارئ"
@@ -22341,5 +22400,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "إشارة سير"
@@ -22349,5 +22408,5 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:787
 msgid "Pedestrian crossing type"
 msgstr "نوع التقاطع للمشاة"
@@ -22356,6 +22415,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:777 build/trans_presets.java:799
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:1423
 msgid "uncontrolled"
 msgstr ""
@@ -22364,6 +22423,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:777 build/trans_presets.java:799
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:1423
 msgid "traffic_signals"
 msgstr "إشارات_السير"
@@ -22372,6 +22431,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:777 build/trans_presets.java:799
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:1423
 msgid "island"
 msgstr "جزيرة"
@@ -22380,6 +22439,6 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:777 build/trans_presets.java:799
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:1423
 msgid "unmarked"
 msgstr ""
@@ -22388,6 +22447,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:778 build/trans_presets.java:801
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:788 build/trans_presets.java:811
+#: build/trans_presets.java:1424
 msgid "Cross on horseback"
 msgstr ""
@@ -22396,6 +22455,6 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:779 build/trans_presets.java:800
-#: build/trans_presets.java:1426
+#: build/trans_presets.java:789 build/trans_presets.java:810
+#: build/trans_presets.java:1425
 msgid "Cross by bicycle"
 msgstr ""
@@ -22404,11 +22463,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:780 build/trans_presets.java:802
-#: build/trans_presets.java:1427
+#: build/trans_presets.java:790 build/trans_presets.java:812
+#: build/trans_presets.java:1426
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:781
+#: build/trans_presets.java:791
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22416,5 +22475,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:791 build/trans_presets.java:813
 msgid "zebra"
 msgstr ""
@@ -22422,5 +22481,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:791 build/trans_presets.java:813
 msgid "pelican"
 msgstr ""
@@ -22428,5 +22487,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:791 build/trans_presets.java:813
 msgid "toucan"
 msgstr "طير الطوقان"
@@ -22434,5 +22493,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:791 build/trans_presets.java:813
 msgid "puffin"
 msgstr ""
@@ -22440,5 +22499,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:791 build/trans_presets.java:813
 msgid "pegasus"
 msgstr ""
@@ -22446,5 +22505,5 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value
-#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:791 build/trans_presets.java:813
 msgid "tiger"
 msgstr "نمر"
@@ -22452,5 +22511,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr "إشارة وقوف"
@@ -22458,5 +22517,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "مستديرة صغيرة"
@@ -22467,15 +22526,15 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "Direction"
 msgstr "الإتجاه"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "clockwise"
 msgstr "إتجاه عقارب الساعة"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:804
 msgid "Pedestrian Crossing"
 msgstr "تقاطع مشاة"
@@ -22484,15 +22543,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:797
+#: build/trans_presets.java:807
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr ""
@@ -22500,40 +22559,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:817
 msgid "Edit Traffic Calming"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:820
 msgid "Passing Place"
 msgstr ""
@@ -22541,5 +22600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:822
 msgid "Edit Passing Place"
 msgstr ""
@@ -22547,5 +22606,5 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:825
 msgid "Turning Circle"
 msgstr ""
@@ -22555,5 +22614,5 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:820
+#: build/trans_presets.java:830
 msgid "City Limit"
 msgstr "حدود المدينة"
@@ -22561,15 +22620,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:832
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:837
 msgid "Second Name"
 msgstr "الإسم الثاني"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:839
 msgid "Speed Camera"
 msgstr "كاميرا مراقبة السير"
@@ -22579,5 +22638,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr ""
@@ -22586,17 +22645,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "مخاضة"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "حرر المخاضة"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr ""
@@ -22604,5 +22652,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:849
+#: build/trans_presets.java:851
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -22614,7 +22662,7 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:854 build/trans_presets.java:2037
-#: build/trans_presets.java:2286 build/trans_presets.java:3961
-#: build/trans_presets.java:3969 build/trans_presets.java:3977
+#: build/trans_presets.java:856 build/trans_presets.java:2038
+#: build/trans_presets.java:2287 build/trans_presets.java:3962
+#: build/trans_presets.java:3970 build/trans_presets.java:3978
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -22649,18 +22697,18 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:855 build/trans_presets.java:1111
-#: build/trans_presets.java:1122 build/trans_presets.java:1136
-#: build/trans_presets.java:1151 build/trans_presets.java:1879
-#: build/trans_presets.java:2341 build/trans_presets.java:2412
-#: build/trans_presets.java:3339 build/trans_presets.java:3870
-#: build/trans_presets.java:3877 build/trans_presets.java:3884
-#: build/trans_presets.java:3891 build/trans_presets.java:3898
-#: build/trans_presets.java:3906 build/trans_presets.java:3914
-#: build/trans_presets.java:3922 build/trans_presets.java:3929
-#: build/trans_presets.java:3936 build/trans_presets.java:3943
-#: build/trans_presets.java:3952 build/trans_presets.java:3962
-#: build/trans_presets.java:3970 build/trans_presets.java:3978
-#: build/trans_presets.java:3985 build/trans_presets.java:3994
-#: build/trans_presets.java:4002 build/trans_presets.java:4267
+#: build/trans_presets.java:857 build/trans_presets.java:1110
+#: build/trans_presets.java:1121 build/trans_presets.java:1135
+#: build/trans_presets.java:1150 build/trans_presets.java:1880
+#: build/trans_presets.java:2342 build/trans_presets.java:2413
+#: build/trans_presets.java:3340 build/trans_presets.java:3871
+#: build/trans_presets.java:3878 build/trans_presets.java:3885
+#: build/trans_presets.java:3892 build/trans_presets.java:3899
+#: build/trans_presets.java:3907 build/trans_presets.java:3915
+#: build/trans_presets.java:3923 build/trans_presets.java:3930
+#: build/trans_presets.java:3937 build/trans_presets.java:3944
+#: build/trans_presets.java:3953 build/trans_presets.java:3963
+#: build/trans_presets.java:3971 build/trans_presets.java:3979
+#: build/trans_presets.java:3986 build/trans_presets.java:3995
+#: build/trans_presets.java:4003 build/trans_presets.java:4268
 msgid "Wikipedia"
 msgstr ""
@@ -22668,5 +22716,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "حواجز"
@@ -22674,5 +22722,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr ""
@@ -22680,5 +22728,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:866
 msgid "Edit Bollard"
 msgstr ""
@@ -22728,27 +22776,27 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:867 build/trans_presets.java:877
-#: build/trans_presets.java:886 build/trans_presets.java:898
-#: build/trans_presets.java:912 build/trans_presets.java:934
-#: build/trans_presets.java:977 build/trans_presets.java:990
-#: build/trans_presets.java:1002 build/trans_presets.java:1014
-#: build/trans_presets.java:1026 build/trans_presets.java:1038
-#: build/trans_presets.java:1048 build/trans_presets.java:1057
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:869 build/trans_presets.java:879
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:914 build/trans_presets.java:936
+#: build/trans_presets.java:976 build/trans_presets.java:989
+#: build/trans_presets.java:1001 build/trans_presets.java:1013
+#: build/trans_presets.java:1025 build/trans_presets.java:1037
+#: build/trans_presets.java:1047 build/trans_presets.java:1056
+#: build/trans_presets.java:1065
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:876
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:884
+#: build/trans_presets.java:886
 msgid "Block"
 msgstr ""
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:895
 msgid "Cattle Grid"
 msgstr ""
@@ -22756,10 +22804,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:897
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr ""
@@ -22767,15 +22815,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:910
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:911
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:922
 msgid "Toll Booth"
 msgstr ""
@@ -22783,5 +22831,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:922
+#: build/trans_presets.java:924
 msgid "Edit Toll Booth"
 msgstr ""
@@ -22789,10 +22837,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "مراقبة الحدود"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "حرّر مراقبة الحدود"
@@ -22801,5 +22849,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr ""
@@ -22808,24 +22856,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr ""
 
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#. item "Barriers/Wire Fence"
-#: build/trans_presets.java:953
-msgid "Wire Fence"
-msgstr ""
-
-#. <key key="barrier" value="wire_fence" />
-#. item "Barriers/Wood Fence"
-#: build/trans_presets.java:956
-msgid "Wood Fence"
-msgstr ""
-
-#. <key key="barrier" value="wood_fence" />
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "barbed_wire"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "chain"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#. item "Leisure/Public Grill" combo "Fuel" display value
+#: build/trans_presets.java:955 build/trans_presets.java:2398
+msgid "electric"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "hedge"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:955 build/trans_presets.java:2677
+msgid "pole"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "split_rail"
+msgstr ""
+
+#. </optional>
 #. item "Barriers/Wall"
-#: build/trans_presets.java:959
+#: build/trans_presets.java:958
 msgid "Wall"
 msgstr "حائط/جدار"
@@ -22833,5 +22900,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "حائط/جدار مدينة"
@@ -22840,5 +22907,5 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:965
 msgid "Retaining Wall"
 msgstr ""
@@ -22849,15 +22916,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
+#: build/trans_presets.java:972
+msgid "Entrance"
+msgstr ""
+
+#. item "Barriers/Entrance" label "Edit Entrance"
 #: build/trans_presets.java:973
-msgid "Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr ""
@@ -22865,50 +22932,50 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:987
+#: build/trans_presets.java:986
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
+#: build/trans_presets.java:997
+msgid "Lift Gate"
+msgstr ""
+
+#. item "Barriers/Lift Gate" label "Edit Lift Gate"
 #: build/trans_presets.java:998
-msgid "Lift Gate"
-msgstr ""
-
-#. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:1009
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
 #: build/trans_presets.java:1010
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1011
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
+#: build/trans_presets.java:1021
+msgid "Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
 #: build/trans_presets.java:1022
-msgid "Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1023
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:1033
+msgid "Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
 #: build/trans_presets.java:1034
-msgid "Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1035
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
 msgstr ""
@@ -22916,25 +22983,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1045
+#: build/trans_presets.java:1044
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
+#: build/trans_presets.java:1052
+msgid "Turnstile"
+msgstr ""
+
+#. item "Barriers/Turnstile" label "Edit Turnstile"
 #: build/trans_presets.java:1053
-msgid "Turnstile"
-msgstr ""
-
-#. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Sally Port"
+#: build/trans_presets.java:1061
+msgid "Sally Port"
+msgstr ""
+
+#. item "Barriers/Sally Port" label "Edit Sally Port"
 #: build/trans_presets.java:1062
-msgid "Sally Port"
-msgstr ""
-
-#. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
 msgstr ""
@@ -22944,6 +23011,6 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1077 build/trans_presets.java:1078
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1076 build/trans_presets.java:1077
+#: build/trans_presets.java:1178
 msgid "Water"
 msgstr "الماء"
@@ -22951,5 +23018,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "مسرب"
@@ -22957,10 +23024,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1081
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr ""
@@ -22968,10 +23035,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1090
+#: build/trans_presets.java:1089
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1095
 msgid "Stream"
 msgstr "جدول نهر"
@@ -22979,10 +23046,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1097
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "قناة"
@@ -22990,10 +23057,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1105
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "نهر"
@@ -23003,5 +23070,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1117
+#: build/trans_presets.java:1116
 msgid "Edit River"
 msgstr "نهر"
@@ -23009,5 +23076,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "نبع"
@@ -23015,20 +23082,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1126
 msgid "Edit Spring"
 msgstr "حرّر نبع"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "شلال ماء"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "حرّر شلال ماء"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "سدّ (صغير)"
@@ -23036,10 +23103,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1139
 msgid "Edit Weir"
 msgstr "سدّ (صغير)"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "سدّ"
@@ -23047,10 +23114,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1146
 msgid "Edit Dam"
 msgstr "حرّر سدّ"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
 msgstr ""
@@ -23058,5 +23125,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1154
 msgid "Edit Groyne"
 msgstr ""
@@ -23066,15 +23133,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1159
 msgid "Basin"
 msgstr "حوض"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1160
 msgid "Edit Basin Landuse"
 msgstr "حرّر حوض"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "خزان"
@@ -23082,15 +23149,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1167
 msgid "Edit Reservoir Landuse"
 msgstr "حرّر خزان"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1172
 msgid "Covered Reservoir"
 msgstr "خزان مغطى"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1173
 msgid "Edit Covered Reservoir"
 msgstr "حرّر خزان مغطى"
@@ -23098,20 +23165,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1180
 msgid "Edit Water"
 msgstr "حرّر الماء"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "شاطئ"
@@ -23119,10 +23186,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1191
 msgid "Edit Coastline"
 msgstr "حرّر شاطئ"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -23131,5 +23198,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1198
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
@@ -23137,5 +23204,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -23146,15 +23213,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1208
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "مستنقع"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr ""
@@ -23167,40 +23234,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1212 build/trans_style.java:2930
+#: build/trans_presets.java:1211 build/trans_style.java:2945
 msgid "marsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "وحل"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -23208,20 +23275,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1220
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "خليج"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -23229,15 +23296,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1231
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. group "Shipping"
+#: build/trans_presets.java:1236
+msgid "Shipping"
+msgstr ""
+
+#. item "Shipping/Ferry Terminal"
 #: build/trans_presets.java:1237
-msgid "Shipping"
-msgstr ""
-
-#. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1238
 msgid "Ferry Terminal"
 msgstr ""
@@ -23245,20 +23312,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1239
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "Cargo"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "vehicle"
 msgstr ""
@@ -23344,26 +23411,26 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1243 build/trans_presets.java:4330
-#: build/trans_presets.java:4360 build/trans_style.java:189
-#: build/trans_style.java:525 build/trans_style.java:545
-#: build/trans_style.java:551 build/trans_style.java:570
-#: build/trans_style.java:577 build/trans_style.java:753
-#: build/trans_style.java:759 build/trans_style.java:765
-#: build/trans_style.java:771 build/trans_style.java:777
+#: build/trans_presets.java:1242 build/trans_presets.java:4332
+#: build/trans_presets.java:4362 build/trans_style.java:189
+#: build/trans_style.java:519 build/trans_style.java:539
+#: build/trans_style.java:545 build/trans_style.java:564
+#: build/trans_style.java:571 build/trans_style.java:747
+#: build/trans_style.java:753 build/trans_style.java:759
+#: build/trans_style.java:765 build/trans_style.java:771
 msgid "bicycle"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "hgv"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers;vehicle"
 msgstr ""
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1244
 msgid "Ferry Route"
 msgstr ""
@@ -23371,5 +23438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1246
 msgid "Edit Ferry"
 msgstr ""
@@ -23378,15 +23445,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "مارينا"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "حرّر مارينا"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "رصيف ميناء"
@@ -23394,10 +23461,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1261
 msgid "Edit Pier"
 msgstr "حرّر رصيف ميناء"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr ""
@@ -23406,5 +23473,5 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1269
 msgid "Turning Point"
 msgstr ""
@@ -23414,5 +23481,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr ""
@@ -23422,10 +23489,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1278
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1282
 msgid "Boatyard"
 msgstr "حوض سفن"
@@ -23433,10 +23500,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1285
+#: build/trans_presets.java:1284
 msgid "Edit Boatyard"
 msgstr "حرّر حوض سفن"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1289
 msgid "Dock"
 msgstr "مرسى"
@@ -23444,20 +23511,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1291
 msgid "Edit Dock"
 msgstr "حرّر مرسى"
 
 #. group "Transport"
+#: build/trans_presets.java:1298
+msgid "Transport"
+msgstr ""
+
+#. group "Transport/Railway"
 #: build/trans_presets.java:1299
-msgid "Transport"
-msgstr ""
-
-#. group "Transport/Railway"
-#: build/trans_presets.java:1300
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "سكة"
@@ -23465,5 +23532,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1303
+#: build/trans_presets.java:1302
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -23493,7 +23560,7 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1307 build/trans_presets.java:1319
-#: build/trans_presets.java:1343 build/trans_presets.java:1355
-#: build/trans_presets.java:1367 build/trans_presets.java:1379
+#: build/trans_presets.java:1306 build/trans_presets.java:1318
+#: build/trans_presets.java:1342 build/trans_presets.java:1354
+#: build/trans_presets.java:1366 build/trans_presets.java:1378
 msgid "Gauge (mm)"
 msgstr ""
@@ -23509,8 +23576,8 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1308 build/trans_presets.java:1320
-#: build/trans_presets.java:1332 build/trans_presets.java:1344
-#: build/trans_presets.java:1356 build/trans_presets.java:1368
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1331 build/trans_presets.java:1343
+#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1379
 msgid "Types"
 msgstr ""
@@ -23524,8 +23591,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1308 build/trans_presets.java:1320
-#: build/trans_presets.java:1332 build/trans_presets.java:1344
-#: build/trans_presets.java:1356 build/trans_presets.java:1368
-#: build/trans_presets.java:1380 build/trans_presets.java:1410
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1331 build/trans_presets.java:1343
+#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1379 build/trans_presets.java:1409
 msgid "yard"
 msgstr ""
@@ -23539,8 +23606,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1308 build/trans_presets.java:1320
-#: build/trans_presets.java:1332 build/trans_presets.java:1344
-#: build/trans_presets.java:1356 build/trans_presets.java:1368
-#: build/trans_presets.java:1380 build/trans_presets.java:1410
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1331 build/trans_presets.java:1343
+#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1379 build/trans_presets.java:1409
 msgid "siding"
 msgstr ""
@@ -23554,8 +23621,8 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1308 build/trans_presets.java:1320
-#: build/trans_presets.java:1332 build/trans_presets.java:1344
-#: build/trans_presets.java:1356 build/trans_presets.java:1368
-#: build/trans_presets.java:1380 build/trans_presets.java:1410
+#: build/trans_presets.java:1307 build/trans_presets.java:1319
+#: build/trans_presets.java:1331 build/trans_presets.java:1343
+#: build/trans_presets.java:1355 build/trans_presets.java:1367
+#: build/trans_presets.java:1379 build/trans_presets.java:1409
 msgid "spur"
 msgstr ""
@@ -23568,8 +23635,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380
 msgid "Electrified"
 msgstr ""
@@ -23582,8 +23649,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380
 msgid "contact_line"
 msgstr ""
@@ -23612,4 +23679,11 @@
 #.
 #. <rule>
+#. <condition k="railway" v="rail"/>
+#. <condition k="service" v="siding"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
 #. color rail
@@ -23644,12 +23718,13 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1309 build/trans_presets.java:1321
-#: build/trans_presets.java:1333 build/trans_presets.java:1345
-#: build/trans_presets.java:1357 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_style.java:595
-#: build/trans_style.java:958 build/trans_style.java:1008
-#: build/trans_style.java:1014 build/trans_style.java:1021
-#: build/trans_style.java:1027 build/trans_style.java:1033
-#: build/trans_style.java:1034 build/trans_style.java:1039
+#: build/trans_presets.java:1308 build/trans_presets.java:1320
+#: build/trans_presets.java:1332 build/trans_presets.java:1344
+#: build/trans_presets.java:1356 build/trans_presets.java:1368
+#: build/trans_presets.java:1380 build/trans_style.java:589
+#: build/trans_style.java:952 build/trans_style.java:959
+#: build/trans_style.java:1023 build/trans_style.java:1029
+#: build/trans_style.java:1036 build/trans_style.java:1042
+#: build/trans_style.java:1048 build/trans_style.java:1049
+#: build/trans_style.java:1054
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -23667,9 +23742,9 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1310 build/trans_presets.java:1322
-#: build/trans_presets.java:1334 build/trans_presets.java:1346
-#: build/trans_presets.java:1358 build/trans_presets.java:1370
-#: build/trans_presets.java:1382 build/trans_presets.java:1637
-#: build/trans_presets.java:3327
+#: build/trans_presets.java:1309 build/trans_presets.java:1321
+#: build/trans_presets.java:1333 build/trans_presets.java:1345
+#: build/trans_presets.java:1357 build/trans_presets.java:1369
+#: build/trans_presets.java:1381 build/trans_presets.java:1636
+#: build/trans_presets.java:3328
 msgid "Voltage"
 msgstr "التوتر"
@@ -23682,8 +23757,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1347
-#: build/trans_presets.java:1359 build/trans_presets.java:1371
-#: build/trans_presets.java:1383
+#: build/trans_presets.java:1310 build/trans_presets.java:1322
+#: build/trans_presets.java:1334 build/trans_presets.java:1346
+#: build/trans_presets.java:1358 build/trans_presets.java:1370
+#: build/trans_presets.java:1382
 msgid "Frequency (Hz)"
 msgstr ""
@@ -23696,8 +23771,8 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1347
-#: build/trans_presets.java:1359 build/trans_presets.java:1371
-#: build/trans_presets.java:1383
+#: build/trans_presets.java:1310 build/trans_presets.java:1322
+#: build/trans_presets.java:1334 build/trans_presets.java:1346
+#: build/trans_presets.java:1358 build/trans_presets.java:1370
+#: build/trans_presets.java:1382
 msgid "16.7"
 msgstr ""
@@ -23705,10 +23780,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1313
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #: build/trans_presets.java:1314
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1315
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
@@ -23716,5 +23791,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "قطار ذات سكة حديد واحدة"
@@ -23722,5 +23797,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1327
 msgid "Edit Monorail"
 msgstr "حرّر قطار ذات سكة حديد واحدة"
@@ -23728,10 +23803,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1337
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
 #: build/trans_presets.java:1338
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
 msgid "Edit Preserved Railway"
 msgstr ""
@@ -23739,10 +23814,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1349
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
 #: build/trans_presets.java:1350
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
 msgid "Edit Light Rail"
 msgstr ""
@@ -23750,10 +23825,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "قطار نفقي"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "حرّر قطار نفقي"
@@ -23761,10 +23836,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "ترام"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr "حرّر ترام"
@@ -23772,5 +23847,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr ""
@@ -23778,5 +23853,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1387
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -23785,10 +23860,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "سكة حديد غير مستعملة"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "حرّر سكة حديد غير مستعملة"
@@ -23797,10 +23872,10 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1409
 msgid "Optional Types"
 msgstr ""
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1411
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -23809,5 +23884,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr ""
@@ -23816,5 +23891,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr ""
@@ -23824,5 +23899,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr ""
@@ -23830,5 +23905,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr ""
@@ -23837,5 +23912,5 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1433
 msgid "Buffer Stop"
 msgstr ""
@@ -23844,10 +23919,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
+#: build/trans_presets.java:1438
+msgid "Aerialway"
+msgstr ""
+
+#. item "Aerialway/Chair Lift"
 #: build/trans_presets.java:1439
-msgid "Aerialway"
-msgstr ""
-
-#. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -23855,5 +23930,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1441
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
@@ -23875,12 +23950,12 @@
 #. item "Facilities/Toilets" text "Reference number"
 #. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1445 build/trans_presets.java:1459
-#: build/trans_presets.java:1470 build/trans_presets.java:1483
-#: build/trans_presets.java:1496 build/trans_presets.java:1510
-#: build/trans_presets.java:1521 build/trans_presets.java:1532
-#: build/trans_presets.java:1543 build/trans_presets.java:1554
-#: build/trans_presets.java:1564 build/trans_presets.java:1591
-#: build/trans_presets.java:2303 build/trans_presets.java:2313
-#: build/trans_presets.java:2646 build/trans_presets.java:3821
+#: build/trans_presets.java:1444 build/trans_presets.java:1458
+#: build/trans_presets.java:1469 build/trans_presets.java:1482
+#: build/trans_presets.java:1495 build/trans_presets.java:1509
+#: build/trans_presets.java:1520 build/trans_presets.java:1531
+#: build/trans_presets.java:1542 build/trans_presets.java:1553
+#: build/trans_presets.java:1563 build/trans_presets.java:1590
+#: build/trans_presets.java:2304 build/trans_presets.java:2314
+#: build/trans_presets.java:2647 build/trans_presets.java:3822
 msgid "Reference number"
 msgstr "الرقم المرجعي"
@@ -23906,14 +23981,14 @@
 #. <optional>
 #. item "Aerialway/Magic Carpet" text "Number of people per hour"
-#: build/trans_presets.java:1447 build/trans_presets.java:1461
-#: build/trans_presets.java:1472 build/trans_presets.java:1485
-#: build/trans_presets.java:1498 build/trans_presets.java:1512
-#: build/trans_presets.java:1523 build/trans_presets.java:1534
-#: build/trans_presets.java:1545 build/trans_presets.java:1556
+#: build/trans_presets.java:1446 build/trans_presets.java:1460
+#: build/trans_presets.java:1471 build/trans_presets.java:1484
+#: build/trans_presets.java:1497 build/trans_presets.java:1511
+#: build/trans_presets.java:1522 build/trans_presets.java:1533
+#: build/trans_presets.java:1544 build/trans_presets.java:1555
 msgid "Number of people per hour"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Number of people per chair"
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1447
 msgid "Number of people per chair"
 msgstr ""
@@ -23931,10 +24006,10 @@
 #. <optional>
 #. item "Aerialway/Goods" text "Typical journey time in minutes"
-#: build/trans_presets.java:1449 build/trans_presets.java:1462
-#: build/trans_presets.java:1474 build/trans_presets.java:1487
-#: build/trans_presets.java:1500 build/trans_presets.java:1513
-#: build/trans_presets.java:1524 build/trans_presets.java:1535
-#: build/trans_presets.java:1546 build/trans_presets.java:1557
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1448 build/trans_presets.java:1461
+#: build/trans_presets.java:1473 build/trans_presets.java:1486
+#: build/trans_presets.java:1499 build/trans_presets.java:1512
+#: build/trans_presets.java:1523 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1556
+#: build/trans_presets.java:1565
 msgid "Typical journey time in minutes"
 msgstr ""
@@ -23942,5 +24017,5 @@
 #. item "Aerialway/Chair Lift" check "Has bubble?"
 #. item "Aerialway/Mixed Lift" check "Has bubble?"
-#: build/trans_presets.java:1450 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1500
 msgid "Has bubble?"
 msgstr ""
@@ -23950,6 +24025,6 @@
 #. item "Aerialway/Gondola" check "Has heating?"
 #. item "Aerialway/Mixed Lift" check "Has heating?"
-#: build/trans_presets.java:1451 build/trans_presets.java:1475
-#: build/trans_presets.java:1488 build/trans_presets.java:1502
+#: build/trans_presets.java:1450 build/trans_presets.java:1474
+#: build/trans_presets.java:1487 build/trans_presets.java:1501
 msgid "Has heating?"
 msgstr ""
@@ -23957,5 +24032,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr ""
@@ -23963,5 +24038,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1456
+#: build/trans_presets.java:1455
 msgid "Edit Drag Lift"
 msgstr ""
@@ -23969,5 +24044,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr ""
@@ -23975,10 +24050,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1466
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Number of people per car"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1472
 msgid "Number of people per car"
 msgstr ""
@@ -23986,5 +24061,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr ""
@@ -23992,10 +24067,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1480
+#: build/trans_presets.java:1479
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Number of people per gondola"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1485
 msgid "Number of people per gondola"
 msgstr ""
@@ -24003,5 +24078,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24009,10 +24084,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1492
 msgid "Edit Mixed Lift (containing both gondolas and chairs)"
 msgstr ""
 
 #. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair"
-#: build/trans_presets.java:1499
+#: build/trans_presets.java:1498
 msgid "Number of people per gondola/chair"
 msgstr ""
@@ -24020,5 +24095,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24026,5 +24101,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1506
 msgid "Edit T-bar Lift"
 msgstr ""
@@ -24032,5 +24107,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24038,5 +24113,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/J-bar Lift" label "Edit J-bar Lift"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1517
 msgid "Edit J-bar Lift"
 msgstr ""
@@ -24044,5 +24119,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24050,5 +24125,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Platter Lift" label "Edit Platter Lift"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1528
 msgid "Edit Platter Lift"
 msgstr ""
@@ -24056,5 +24131,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24062,5 +24137,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Rope Tow" label "Edit Rope Tow"
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1539
 msgid "Edit Rope Tow"
 msgstr ""
@@ -24068,5 +24143,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24074,5 +24149,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1550
 msgid "Edit Magic Carpet"
 msgstr ""
@@ -24080,5 +24155,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24086,5 +24161,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24094,5 +24169,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24101,5 +24176,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1571
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24107,5 +24182,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24114,5 +24189,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1577
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24130,6 +24205,6 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1585 build/trans_presets.java:1700
-#: build/trans_presets.java:1732 build/trans_surveyor.java:24
+#: build/trans_presets.java:1584 build/trans_presets.java:1699
+#: build/trans_presets.java:1731 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr ""
@@ -24138,5 +24213,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1587
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -24144,5 +24219,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1592 build/trans_presets.java:1705
+#: build/trans_presets.java:1591 build/trans_presets.java:1704
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
@@ -24150,5 +24225,5 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1592 build/trans_presets.java:1705
+#: build/trans_presets.java:1591 build/trans_presets.java:1704
 msgid "surface"
 msgstr "مساحة"
@@ -24156,10 +24231,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1592 build/trans_presets.java:1705
+#: build/trans_presets.java:1591 build/trans_presets.java:1704
 msgid "underground"
 msgstr "تحت الأرض"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr ""
@@ -24170,7 +24245,7 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1594 build/trans_presets.java:1706
-#: build/trans_presets.java:2304 build/trans_presets.java:2314
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:1593 build/trans_presets.java:1705
+#: build/trans_presets.java:2305 build/trans_presets.java:2315
+#: build/trans_presets.java:2648
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
@@ -24178,25 +24253,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1595
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" combo "Spaces for Disabled"
 #: build/trans_presets.java:1596
-msgid "Capacity (overall)"
-msgstr ""
-
-#. item "Car/Parking" combo "Spaces for Disabled"
+msgid "Spaces for Disabled"
+msgstr ""
+
+#. item "Car/Parking" combo "Spaces for Women"
 #: build/trans_presets.java:1597
-msgid "Spaces for Disabled"
-msgstr ""
-
-#. item "Car/Parking" combo "Spaces for Women"
+msgid "Spaces for Women"
+msgstr ""
+
+#. item "Car/Parking" combo "Spaces for Parents"
 #: build/trans_presets.java:1598
-msgid "Spaces for Women"
-msgstr ""
-
-#. item "Car/Parking" combo "Spaces for Parents"
+msgid "Spaces for Parents"
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
 #: build/trans_presets.java:1599
-msgid "Spaces for Parents"
-msgstr ""
-
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1600
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
@@ -24204,5 +24279,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "وقود"
@@ -24212,5 +24287,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1606
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
@@ -24223,117 +24298,117 @@
 #. item "Car/Rental" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1609 build/trans_presets.java:1644
-#: build/trans_presets.java:1660 build/trans_presets.java:1668
-#: build/trans_presets.java:1684 build/trans_presets.java:1713
+#: build/trans_presets.java:1608 build/trans_presets.java:1643
+#: build/trans_presets.java:1659 build/trans_presets.java:1667
+#: build/trans_presets.java:1683 build/trans_presets.java:1712
 msgid "Brand"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Agip"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Aral"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Avia"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "BP"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Esso"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "OMV"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Q8"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Repsol"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Shell"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Statoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Tamoil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Texaco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Total"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Independent"
 msgstr ""
@@ -24426,48 +24501,48 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1613 build/trans_presets.java:1646
-#: build/trans_presets.java:1662 build/trans_presets.java:1670
-#: build/trans_presets.java:1686 build/trans_presets.java:1695
-#: build/trans_presets.java:1715 build/trans_presets.java:2098
-#: build/trans_presets.java:2118 build/trans_presets.java:2135
-#: build/trans_presets.java:2154 build/trans_presets.java:2173
-#: build/trans_presets.java:2189 build/trans_presets.java:2206
-#: build/trans_presets.java:2223 build/trans_presets.java:2239
-#: build/trans_presets.java:2254 build/trans_presets.java:2340
-#: build/trans_presets.java:2351 build/trans_presets.java:2358
-#: build/trans_presets.java:2374 build/trans_presets.java:2411
-#: build/trans_presets.java:2427 build/trans_presets.java:2485
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2597 build/trans_presets.java:2606
-#: build/trans_presets.java:2614 build/trans_presets.java:2637
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:3345 build/trans_presets.java:3353
-#: build/trans_presets.java:3402 build/trans_presets.java:3409
-#: build/trans_presets.java:3416 build/trans_presets.java:3424
-#: build/trans_presets.java:3431 build/trans_presets.java:3440
-#: build/trans_presets.java:3449 build/trans_presets.java:3456
-#: build/trans_presets.java:3466 build/trans_presets.java:3475
-#: build/trans_presets.java:3481 build/trans_presets.java:3489
-#: build/trans_presets.java:3495 build/trans_presets.java:3503
-#: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3525 build/trans_presets.java:3531
-#: build/trans_presets.java:3539 build/trans_presets.java:3546
-#: build/trans_presets.java:3552 build/trans_presets.java:3561
-#: build/trans_presets.java:3569 build/trans_presets.java:3575
-#: build/trans_presets.java:3584 build/trans_presets.java:3593
-#: build/trans_presets.java:3599 build/trans_presets.java:3605
-#: build/trans_presets.java:3615 build/trans_presets.java:3623
-#: build/trans_presets.java:3640 build/trans_presets.java:3649
-#: build/trans_presets.java:3656 build/trans_presets.java:3662
-#: build/trans_presets.java:3668 build/trans_presets.java:3677
-#: build/trans_presets.java:3686 build/trans_presets.java:3694
-#: build/trans_presets.java:3701 build/trans_presets.java:3709
-#: build/trans_presets.java:3716 build/trans_presets.java:3725
-#: build/trans_presets.java:3732 build/trans_presets.java:3741
-#: build/trans_presets.java:3750 build/trans_presets.java:3759
-#: build/trans_presets.java:3766 build/trans_presets.java:3775
-#: build/trans_presets.java:3781 build/trans_presets.java:3788
-#: build/trans_presets.java:3797 build/trans_presets.java:3803
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:1612 build/trans_presets.java:1645
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1694
+#: build/trans_presets.java:1714 build/trans_presets.java:2099
+#: build/trans_presets.java:2119 build/trans_presets.java:2136
+#: build/trans_presets.java:2155 build/trans_presets.java:2174
+#: build/trans_presets.java:2190 build/trans_presets.java:2207
+#: build/trans_presets.java:2224 build/trans_presets.java:2240
+#: build/trans_presets.java:2255 build/trans_presets.java:2341
+#: build/trans_presets.java:2352 build/trans_presets.java:2359
+#: build/trans_presets.java:2375 build/trans_presets.java:2412
+#: build/trans_presets.java:2428 build/trans_presets.java:2486
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2598 build/trans_presets.java:2607
+#: build/trans_presets.java:2615 build/trans_presets.java:2638
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:3346 build/trans_presets.java:3354
+#: build/trans_presets.java:3403 build/trans_presets.java:3410
+#: build/trans_presets.java:3417 build/trans_presets.java:3425
+#: build/trans_presets.java:3432 build/trans_presets.java:3441
+#: build/trans_presets.java:3450 build/trans_presets.java:3457
+#: build/trans_presets.java:3467 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3496 build/trans_presets.java:3504
+#: build/trans_presets.java:3513 build/trans_presets.java:3519
+#: build/trans_presets.java:3526 build/trans_presets.java:3532
+#: build/trans_presets.java:3540 build/trans_presets.java:3547
+#: build/trans_presets.java:3553 build/trans_presets.java:3562
+#: build/trans_presets.java:3570 build/trans_presets.java:3576
+#: build/trans_presets.java:3585 build/trans_presets.java:3594
+#: build/trans_presets.java:3600 build/trans_presets.java:3606
+#: build/trans_presets.java:3616 build/trans_presets.java:3624
+#: build/trans_presets.java:3641 build/trans_presets.java:3650
+#: build/trans_presets.java:3657 build/trans_presets.java:3663
+#: build/trans_presets.java:3669 build/trans_presets.java:3678
+#: build/trans_presets.java:3687 build/trans_presets.java:3695
+#: build/trans_presets.java:3702 build/trans_presets.java:3710
+#: build/trans_presets.java:3717 build/trans_presets.java:3726
+#: build/trans_presets.java:3733 build/trans_presets.java:3742
+#: build/trans_presets.java:3751 build/trans_presets.java:3760
+#: build/trans_presets.java:3767 build/trans_presets.java:3776
+#: build/trans_presets.java:3782 build/trans_presets.java:3789
+#: build/trans_presets.java:3798 build/trans_presets.java:3804
+#: build/trans_presets.java:3813
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -24558,47 +24633,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1613 build/trans_presets.java:1646
-#: build/trans_presets.java:1662 build/trans_presets.java:1670
-#: build/trans_presets.java:1686 build/trans_presets.java:1695
-#: build/trans_presets.java:1715 build/trans_presets.java:2098
-#: build/trans_presets.java:2118 build/trans_presets.java:2135
-#: build/trans_presets.java:2154 build/trans_presets.java:2173
-#: build/trans_presets.java:2189 build/trans_presets.java:2206
-#: build/trans_presets.java:2223 build/trans_presets.java:2254
-#: build/trans_presets.java:2340 build/trans_presets.java:2351
-#: build/trans_presets.java:2358 build/trans_presets.java:2411
-#: build/trans_presets.java:2427 build/trans_presets.java:2451
-#: build/trans_presets.java:2485 build/trans_presets.java:2576
-#: build/trans_presets.java:2582 build/trans_presets.java:2597
-#: build/trans_presets.java:2606 build/trans_presets.java:2637
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:3345 build/trans_presets.java:3353
-#: build/trans_presets.java:3402 build/trans_presets.java:3409
-#: build/trans_presets.java:3416 build/trans_presets.java:3424
-#: build/trans_presets.java:3431 build/trans_presets.java:3440
-#: build/trans_presets.java:3449 build/trans_presets.java:3456
-#: build/trans_presets.java:3466 build/trans_presets.java:3475
-#: build/trans_presets.java:3481 build/trans_presets.java:3489
-#: build/trans_presets.java:3495 build/trans_presets.java:3503
-#: build/trans_presets.java:3512 build/trans_presets.java:3518
-#: build/trans_presets.java:3525 build/trans_presets.java:3531
-#: build/trans_presets.java:3539 build/trans_presets.java:3546
-#: build/trans_presets.java:3552 build/trans_presets.java:3561
-#: build/trans_presets.java:3569 build/trans_presets.java:3575
-#: build/trans_presets.java:3584 build/trans_presets.java:3593
-#: build/trans_presets.java:3599 build/trans_presets.java:3605
-#: build/trans_presets.java:3615 build/trans_presets.java:3623
-#: build/trans_presets.java:3640 build/trans_presets.java:3649
-#: build/trans_presets.java:3656 build/trans_presets.java:3662
-#: build/trans_presets.java:3668 build/trans_presets.java:3677
-#: build/trans_presets.java:3686 build/trans_presets.java:3694
-#: build/trans_presets.java:3701 build/trans_presets.java:3709
-#: build/trans_presets.java:3716 build/trans_presets.java:3725
-#: build/trans_presets.java:3732 build/trans_presets.java:3741
-#: build/trans_presets.java:3750 build/trans_presets.java:3759
-#: build/trans_presets.java:3766 build/trans_presets.java:3775
-#: build/trans_presets.java:3781 build/trans_presets.java:3788
-#: build/trans_presets.java:3797 build/trans_presets.java:3803
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:1612 build/trans_presets.java:1645
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1694
+#: build/trans_presets.java:1714 build/trans_presets.java:2099
+#: build/trans_presets.java:2119 build/trans_presets.java:2136
+#: build/trans_presets.java:2155 build/trans_presets.java:2174
+#: build/trans_presets.java:2190 build/trans_presets.java:2207
+#: build/trans_presets.java:2224 build/trans_presets.java:2255
+#: build/trans_presets.java:2341 build/trans_presets.java:2352
+#: build/trans_presets.java:2359 build/trans_presets.java:2412
+#: build/trans_presets.java:2428 build/trans_presets.java:2452
+#: build/trans_presets.java:2486 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2598
+#: build/trans_presets.java:2607 build/trans_presets.java:2638
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:3346 build/trans_presets.java:3354
+#: build/trans_presets.java:3403 build/trans_presets.java:3410
+#: build/trans_presets.java:3417 build/trans_presets.java:3425
+#: build/trans_presets.java:3432 build/trans_presets.java:3441
+#: build/trans_presets.java:3450 build/trans_presets.java:3457
+#: build/trans_presets.java:3467 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3496 build/trans_presets.java:3504
+#: build/trans_presets.java:3513 build/trans_presets.java:3519
+#: build/trans_presets.java:3526 build/trans_presets.java:3532
+#: build/trans_presets.java:3540 build/trans_presets.java:3547
+#: build/trans_presets.java:3553 build/trans_presets.java:3562
+#: build/trans_presets.java:3570 build/trans_presets.java:3576
+#: build/trans_presets.java:3585 build/trans_presets.java:3594
+#: build/trans_presets.java:3600 build/trans_presets.java:3606
+#: build/trans_presets.java:3616 build/trans_presets.java:3624
+#: build/trans_presets.java:3641 build/trans_presets.java:3650
+#: build/trans_presets.java:3657 build/trans_presets.java:3663
+#: build/trans_presets.java:3669 build/trans_presets.java:3678
+#: build/trans_presets.java:3687 build/trans_presets.java:3695
+#: build/trans_presets.java:3702 build/trans_presets.java:3710
+#: build/trans_presets.java:3717 build/trans_presets.java:3726
+#: build/trans_presets.java:3733 build/trans_presets.java:3742
+#: build/trans_presets.java:3751 build/trans_presets.java:3760
+#: build/trans_presets.java:3767 build/trans_presets.java:3776
+#: build/trans_presets.java:3782 build/trans_presets.java:3789
+#: build/trans_presets.java:3798 build/trans_presets.java:3804
+#: build/trans_presets.java:3813
 msgid "24/7"
 msgstr ""
@@ -24690,47 +24765,47 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1613 build/trans_presets.java:1646
-#: build/trans_presets.java:1662 build/trans_presets.java:1670
-#: build/trans_presets.java:1686 build/trans_presets.java:1695
-#: build/trans_presets.java:1715 build/trans_presets.java:2098
-#: build/trans_presets.java:2118 build/trans_presets.java:2135
-#: build/trans_presets.java:2154 build/trans_presets.java:2173
-#: build/trans_presets.java:2189 build/trans_presets.java:2206
-#: build/trans_presets.java:2223 build/trans_presets.java:2254
-#: build/trans_presets.java:2340 build/trans_presets.java:2351
-#: build/trans_presets.java:2358 build/trans_presets.java:2374
-#: build/trans_presets.java:2411 build/trans_presets.java:2427
-#: build/trans_presets.java:2451 build/trans_presets.java:2485
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2597 build/trans_presets.java:2606
-#: build/trans_presets.java:2637 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:3345
-#: build/trans_presets.java:3353 build/trans_presets.java:3402
-#: build/trans_presets.java:3409 build/trans_presets.java:3416
-#: build/trans_presets.java:3424 build/trans_presets.java:3431
-#: build/trans_presets.java:3440 build/trans_presets.java:3449
-#: build/trans_presets.java:3456 build/trans_presets.java:3466
-#: build/trans_presets.java:3475 build/trans_presets.java:3481
-#: build/trans_presets.java:3489 build/trans_presets.java:3495
-#: build/trans_presets.java:3503 build/trans_presets.java:3512
-#: build/trans_presets.java:3518 build/trans_presets.java:3525
-#: build/trans_presets.java:3531 build/trans_presets.java:3539
-#: build/trans_presets.java:3546 build/trans_presets.java:3552
-#: build/trans_presets.java:3561 build/trans_presets.java:3569
-#: build/trans_presets.java:3575 build/trans_presets.java:3584
-#: build/trans_presets.java:3593 build/trans_presets.java:3599
-#: build/trans_presets.java:3605 build/trans_presets.java:3615
-#: build/trans_presets.java:3623 build/trans_presets.java:3640
-#: build/trans_presets.java:3649 build/trans_presets.java:3656
-#: build/trans_presets.java:3662 build/trans_presets.java:3668
-#: build/trans_presets.java:3677 build/trans_presets.java:3686
-#: build/trans_presets.java:3694 build/trans_presets.java:3701
-#: build/trans_presets.java:3709 build/trans_presets.java:3716
-#: build/trans_presets.java:3725 build/trans_presets.java:3732
-#: build/trans_presets.java:3741 build/trans_presets.java:3750
-#: build/trans_presets.java:3759 build/trans_presets.java:3766
-#: build/trans_presets.java:3775 build/trans_presets.java:3781
-#: build/trans_presets.java:3788 build/trans_presets.java:3797
-#: build/trans_presets.java:3803 build/trans_presets.java:3812
+#: build/trans_presets.java:1612 build/trans_presets.java:1645
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1694
+#: build/trans_presets.java:1714 build/trans_presets.java:2099
+#: build/trans_presets.java:2119 build/trans_presets.java:2136
+#: build/trans_presets.java:2155 build/trans_presets.java:2174
+#: build/trans_presets.java:2190 build/trans_presets.java:2207
+#: build/trans_presets.java:2224 build/trans_presets.java:2255
+#: build/trans_presets.java:2341 build/trans_presets.java:2352
+#: build/trans_presets.java:2359 build/trans_presets.java:2375
+#: build/trans_presets.java:2412 build/trans_presets.java:2428
+#: build/trans_presets.java:2452 build/trans_presets.java:2486
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2598 build/trans_presets.java:2607
+#: build/trans_presets.java:2638 build/trans_presets.java:2795
+#: build/trans_presets.java:2801 build/trans_presets.java:3346
+#: build/trans_presets.java:3354 build/trans_presets.java:3403
+#: build/trans_presets.java:3410 build/trans_presets.java:3417
+#: build/trans_presets.java:3425 build/trans_presets.java:3432
+#: build/trans_presets.java:3441 build/trans_presets.java:3450
+#: build/trans_presets.java:3457 build/trans_presets.java:3467
+#: build/trans_presets.java:3476 build/trans_presets.java:3482
+#: build/trans_presets.java:3490 build/trans_presets.java:3496
+#: build/trans_presets.java:3504 build/trans_presets.java:3513
+#: build/trans_presets.java:3519 build/trans_presets.java:3526
+#: build/trans_presets.java:3532 build/trans_presets.java:3540
+#: build/trans_presets.java:3547 build/trans_presets.java:3553
+#: build/trans_presets.java:3562 build/trans_presets.java:3570
+#: build/trans_presets.java:3576 build/trans_presets.java:3585
+#: build/trans_presets.java:3594 build/trans_presets.java:3600
+#: build/trans_presets.java:3606 build/trans_presets.java:3616
+#: build/trans_presets.java:3624 build/trans_presets.java:3641
+#: build/trans_presets.java:3650 build/trans_presets.java:3657
+#: build/trans_presets.java:3663 build/trans_presets.java:3669
+#: build/trans_presets.java:3678 build/trans_presets.java:3687
+#: build/trans_presets.java:3695 build/trans_presets.java:3702
+#: build/trans_presets.java:3710 build/trans_presets.java:3717
+#: build/trans_presets.java:3726 build/trans_presets.java:3733
+#: build/trans_presets.java:3742 build/trans_presets.java:3751
+#: build/trans_presets.java:3760 build/trans_presets.java:3767
+#: build/trans_presets.java:3776 build/trans_presets.java:3782
+#: build/trans_presets.java:3789 build/trans_presets.java:3798
+#: build/trans_presets.java:3804 build/trans_presets.java:3813
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -24800,126 +24875,126 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1613 build/trans_presets.java:1646
-#: build/trans_presets.java:1662 build/trans_presets.java:1670
-#: build/trans_presets.java:1686 build/trans_presets.java:1695
-#: build/trans_presets.java:1715 build/trans_presets.java:2098
-#: build/trans_presets.java:2118 build/trans_presets.java:2135
-#: build/trans_presets.java:2154 build/trans_presets.java:2173
-#: build/trans_presets.java:2189 build/trans_presets.java:2206
-#: build/trans_presets.java:2223 build/trans_presets.java:2254
-#: build/trans_presets.java:2340 build/trans_presets.java:2351
-#: build/trans_presets.java:2358 build/trans_presets.java:2411
-#: build/trans_presets.java:2427 build/trans_presets.java:2451
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2597 build/trans_presets.java:2637
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:3345 build/trans_presets.java:3353
-#: build/trans_presets.java:3402 build/trans_presets.java:3409
-#: build/trans_presets.java:3416 build/trans_presets.java:3424
-#: build/trans_presets.java:3431 build/trans_presets.java:3456
-#: build/trans_presets.java:3481 build/trans_presets.java:3489
-#: build/trans_presets.java:3495 build/trans_presets.java:3503
-#: build/trans_presets.java:3518 build/trans_presets.java:3525
-#: build/trans_presets.java:3531 build/trans_presets.java:3539
-#: build/trans_presets.java:3546 build/trans_presets.java:3552
-#: build/trans_presets.java:3569 build/trans_presets.java:3575
-#: build/trans_presets.java:3599 build/trans_presets.java:3605
-#: build/trans_presets.java:3615 build/trans_presets.java:3623
-#: build/trans_presets.java:3656 build/trans_presets.java:3662
-#: build/trans_presets.java:3668 build/trans_presets.java:3694
-#: build/trans_presets.java:3701 build/trans_presets.java:3709
-#: build/trans_presets.java:3716 build/trans_presets.java:3732
-#: build/trans_presets.java:3766 build/trans_presets.java:3781
-#: build/trans_presets.java:3788 build/trans_presets.java:3803
+#: build/trans_presets.java:1612 build/trans_presets.java:1645
+#: build/trans_presets.java:1661 build/trans_presets.java:1669
+#: build/trans_presets.java:1685 build/trans_presets.java:1694
+#: build/trans_presets.java:1714 build/trans_presets.java:2099
+#: build/trans_presets.java:2119 build/trans_presets.java:2136
+#: build/trans_presets.java:2155 build/trans_presets.java:2174
+#: build/trans_presets.java:2190 build/trans_presets.java:2207
+#: build/trans_presets.java:2224 build/trans_presets.java:2255
+#: build/trans_presets.java:2341 build/trans_presets.java:2352
+#: build/trans_presets.java:2359 build/trans_presets.java:2412
+#: build/trans_presets.java:2428 build/trans_presets.java:2452
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2598 build/trans_presets.java:2638
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: build/trans_presets.java:3346 build/trans_presets.java:3354
+#: build/trans_presets.java:3403 build/trans_presets.java:3410
+#: build/trans_presets.java:3417 build/trans_presets.java:3425
+#: build/trans_presets.java:3432 build/trans_presets.java:3457
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3496 build/trans_presets.java:3504
+#: build/trans_presets.java:3519 build/trans_presets.java:3526
+#: build/trans_presets.java:3532 build/trans_presets.java:3540
+#: build/trans_presets.java:3547 build/trans_presets.java:3553
+#: build/trans_presets.java:3570 build/trans_presets.java:3576
+#: build/trans_presets.java:3600 build/trans_presets.java:3606
+#: build/trans_presets.java:3616 build/trans_presets.java:3624
+#: build/trans_presets.java:3657 build/trans_presets.java:3663
+#: build/trans_presets.java:3669 build/trans_presets.java:3695
+#: build/trans_presets.java:3702 build/trans_presets.java:3710
+#: build/trans_presets.java:3717 build/trans_presets.java:3733
+#: build/trans_presets.java:3767 build/trans_presets.java:3782
+#: build/trans_presets.java:3789 build/trans_presets.java:3804
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop"
+#: build/trans_presets.java:1613
+msgid "With shop"
+msgstr ""
+
+#. item "Car/Fuel" combo "With shop" display value
+#: build/trans_presets.java:1613
+msgid "convenience"
+msgstr ""
+
+#. item "Car/Fuel" combo "With shop" display value
+#: build/trans_presets.java:1613
+msgid "kiosk"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
 #: build/trans_presets.java:1614
-msgid "With shop"
-msgstr ""
-
-#. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
-msgid "convenience"
-msgstr ""
-
-#. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
-msgid "kiosk"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
 #: build/trans_presets.java:1615
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
 #: build/trans_presets.java:1616
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
 #: build/trans_presets.java:1617
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
 #: build/trans_presets.java:1618
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
 #: build/trans_presets.java:1619
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1620
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1621
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1622
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1623
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1624
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1625
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1626
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1627
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
 #: build/trans_presets.java:1628
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1629
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -24927,5 +25002,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -24933,20 +25008,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1633
 msgid "Edit Charging Station (for electric cars)"
 msgstr ""
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1637
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1639
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
@@ -24954,5 +25029,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr ""
@@ -24960,5 +25035,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1650
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
@@ -24966,20 +25041,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1656 build/trans_presets.java:1719
+#: build/trans_presets.java:1655 build/trans_presets.java:1718
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
 
 #. item "Car/Tyres"
+#: build/trans_presets.java:1663
+msgid "Tyres"
+msgstr ""
+
+#. item "Car/Tyres" label "Edit Tyres"
 #: build/trans_presets.java:1664
-msgid "Tyres"
-msgstr ""
-
-#. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1665
 msgid "Edit Tyres"
 msgstr ""
@@ -24987,5 +25062,5 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1671 build/trans_presets.java:1724
+#: build/trans_presets.java:1670 build/trans_presets.java:1723
 msgid "Contact:"
 msgstr ""
@@ -25029,15 +25104,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1672 build/trans_presets.java:1725
-#: build/trans_presets.java:1958 build/trans_presets.java:1976
-#: build/trans_presets.java:1992 build/trans_presets.java:2009
-#: build/trans_presets.java:2027 build/trans_presets.java:2044
-#: build/trans_presets.java:2066 build/trans_presets.java:2083
-#: build/trans_presets.java:2106 build/trans_presets.java:2125
-#: build/trans_presets.java:2142 build/trans_presets.java:2161
-#: build/trans_presets.java:2180 build/trans_presets.java:2196
-#: build/trans_presets.java:2213 build/trans_presets.java:2228
-#: build/trans_presets.java:2461 build/trans_presets.java:2626
-#: build/trans_presets.java:4261
+#: build/trans_presets.java:1671 build/trans_presets.java:1724
+#: build/trans_presets.java:1959 build/trans_presets.java:1977
+#: build/trans_presets.java:1993 build/trans_presets.java:2010
+#: build/trans_presets.java:2028 build/trans_presets.java:2045
+#: build/trans_presets.java:2067 build/trans_presets.java:2084
+#: build/trans_presets.java:2107 build/trans_presets.java:2126
+#: build/trans_presets.java:2143 build/trans_presets.java:2162
+#: build/trans_presets.java:2181 build/trans_presets.java:2197
+#: build/trans_presets.java:2214 build/trans_presets.java:2229
+#: build/trans_presets.java:2462 build/trans_presets.java:2627
+#: build/trans_presets.java:4262
 msgid "Phone Number"
 msgstr "رقم الهاتف"
@@ -25062,14 +25137,14 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1673 build/trans_presets.java:1726
-#: build/trans_presets.java:1959 build/trans_presets.java:1977
-#: build/trans_presets.java:1993 build/trans_presets.java:2010
-#: build/trans_presets.java:2028 build/trans_presets.java:2045
-#: build/trans_presets.java:2067 build/trans_presets.java:2084
-#: build/trans_presets.java:2107 build/trans_presets.java:2126
-#: build/trans_presets.java:2143 build/trans_presets.java:2162
-#: build/trans_presets.java:2181 build/trans_presets.java:2197
-#: build/trans_presets.java:2214 build/trans_presets.java:2229
-#: build/trans_presets.java:4262
+#: build/trans_presets.java:1672 build/trans_presets.java:1725
+#: build/trans_presets.java:1960 build/trans_presets.java:1978
+#: build/trans_presets.java:1994 build/trans_presets.java:2011
+#: build/trans_presets.java:2029 build/trans_presets.java:2046
+#: build/trans_presets.java:2068 build/trans_presets.java:2085
+#: build/trans_presets.java:2108 build/trans_presets.java:2127
+#: build/trans_presets.java:2144 build/trans_presets.java:2163
+#: build/trans_presets.java:2182 build/trans_presets.java:2198
+#: build/trans_presets.java:2215 build/trans_presets.java:2230
+#: build/trans_presets.java:4263
 msgid "Fax Number"
 msgstr ""
@@ -25097,15 +25172,15 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1674 build/trans_presets.java:1696
-#: build/trans_presets.java:1727 build/trans_presets.java:1960
-#: build/trans_presets.java:1978 build/trans_presets.java:1994
-#: build/trans_presets.java:2011 build/trans_presets.java:2029
-#: build/trans_presets.java:2046 build/trans_presets.java:2068
-#: build/trans_presets.java:2085 build/trans_presets.java:2108
-#: build/trans_presets.java:2127 build/trans_presets.java:2144
-#: build/trans_presets.java:2163 build/trans_presets.java:2182
-#: build/trans_presets.java:2198 build/trans_presets.java:2215
-#: build/trans_presets.java:2230 build/trans_presets.java:2462
-#: build/trans_presets.java:4264
+#: build/trans_presets.java:1673 build/trans_presets.java:1695
+#: build/trans_presets.java:1726 build/trans_presets.java:1961
+#: build/trans_presets.java:1979 build/trans_presets.java:1995
+#: build/trans_presets.java:2012 build/trans_presets.java:2030
+#: build/trans_presets.java:2047 build/trans_presets.java:2069
+#: build/trans_presets.java:2086 build/trans_presets.java:2109
+#: build/trans_presets.java:2128 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2183
+#: build/trans_presets.java:2199 build/trans_presets.java:2216
+#: build/trans_presets.java:2231 build/trans_presets.java:2463
+#: build/trans_presets.java:4265
 msgid "Website"
 msgstr ""
@@ -25130,14 +25205,14 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1675 build/trans_presets.java:1728
-#: build/trans_presets.java:1961 build/trans_presets.java:1979
-#: build/trans_presets.java:1995 build/trans_presets.java:2012
-#: build/trans_presets.java:2030 build/trans_presets.java:2047
-#: build/trans_presets.java:2069 build/trans_presets.java:2086
-#: build/trans_presets.java:2109 build/trans_presets.java:2128
-#: build/trans_presets.java:2145 build/trans_presets.java:2164
-#: build/trans_presets.java:2183 build/trans_presets.java:2199
-#: build/trans_presets.java:2216 build/trans_presets.java:2231
-#: build/trans_presets.java:4265
+#: build/trans_presets.java:1674 build/trans_presets.java:1727
+#: build/trans_presets.java:1962 build/trans_presets.java:1980
+#: build/trans_presets.java:1996 build/trans_presets.java:2013
+#: build/trans_presets.java:2031 build/trans_presets.java:2048
+#: build/trans_presets.java:2070 build/trans_presets.java:2087
+#: build/trans_presets.java:2110 build/trans_presets.java:2129
+#: build/trans_presets.java:2146 build/trans_presets.java:2165
+#: build/trans_presets.java:2184 build/trans_presets.java:2200
+#: build/trans_presets.java:2217 build/trans_presets.java:2232
+#: build/trans_presets.java:4266
 msgid "Email Address"
 msgstr ""
@@ -25147,6 +25222,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1678 build/trans_presets.java:1718
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1677 build/trans_presets.java:1717
+#: build/trans_presets.java:1754
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -25155,10 +25230,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1680
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -25166,5 +25241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1689
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
@@ -25173,16 +25248,16 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1693 build/trans_presets.java:1704
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1692 build/trans_presets.java:1703
+#: build/trans_presets.java:1736
 msgid "Capacity"
 msgstr "إستيعاب"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1700
 msgid "Edit Motorcycle Parking"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
 msgstr ""
@@ -25190,25 +25265,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1709
 msgid "Edit Shop Motorcycle"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1712
 msgid "independent"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
+#: build/trans_presets.java:1715
+msgid "Services:"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
 #: build/trans_presets.java:1716
-msgid "Services:"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1717
 msgid "Sale"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "yes"
@@ -25216,5 +25291,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25222,5 +25297,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25228,5 +25303,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25237,6 +25312,6 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1718 build/trans_presets.java:1719
-#: build/trans_presets.java:1721 build/trans_presets.java:1722
+#: build/trans_presets.java:1717 build/trans_presets.java:1718
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
 msgid "brand"
 msgstr ""
@@ -25244,35 +25319,35 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1719 build/trans_presets.java:1721
+#: build/trans_presets.java:1718 build/trans_presets.java:1720
 msgid "oldtimer"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
+#: build/trans_presets.java:1719
+msgid "Safety inspection"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1719
+msgid "DEKRA"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1719
+msgid "GTÜ"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1719
+msgid "MOT"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
+#: build/trans_presets.java:1719
+msgid "TÜV"
+msgstr ""
+
+#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
 #: build/trans_presets.java:1720
-msgid "Safety inspection"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
-msgid "DEKRA"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
-msgid "GTÜ"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
-msgid "MOT"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
-msgid "TÜV"
-msgstr ""
-
-#. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1721
 msgid "Parts"
 msgstr ""
@@ -25282,6 +25357,6 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1722 build/trans_presets.java:2691
-#: build/trans_presets.java:3498 build/trans_presets.java:3499
+#: build/trans_presets.java:1721 build/trans_presets.java:2692
+#: build/trans_presets.java:3499 build/trans_presets.java:3500
 msgid "Clothes"
 msgstr "ملابس"
@@ -25289,10 +25364,56 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1733
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
 
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "anchors"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "ground_slots"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "informal"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "lockers"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "shed"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "sheffield"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "stands"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "wall_loops"
+msgstr ""
+
+#. item "Bicycle/Parking" check "Covered"
+#. item "Leisure/Public Grill" combo "Covered"
+#: build/trans_presets.java:1738 build/trans_presets.java:2397
+msgid "Covered"
+msgstr ""
+
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1740
 msgid "Bike Dealer"
 msgstr ""
@@ -25301,40 +25422,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1746
 msgid "Bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1747
 msgid "Second-hand bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Bicycles are repaired"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1749
 msgid "Bicycles are rented"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1750
 msgid "Free bicycle pump"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1750
+#: build/trans_presets.java:1751
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are washed (for a fee)"
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1752
 msgid "Bicycles are washed (for a fee)"
 msgstr ""
@@ -25343,10 +25464,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1757
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1761
+#: build/trans_presets.java:1762
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -25354,5 +25475,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -25362,5 +25483,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1766
 msgctxt "railway"
 msgid "Edit Station"
@@ -25368,5 +25489,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr ""
@@ -25374,5 +25495,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -25380,5 +25501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1776
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -25386,5 +25507,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -25393,5 +25514,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
 #. item "Public Transport/Tram Stop" label "Edit Tram Stop"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1786
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -25399,5 +25520,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -25406,5 +25527,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1796
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -25416,5 +25537,5 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1798 build/trans_presets.java:1843
+#: build/trans_presets.java:1799 build/trans_presets.java:1844
 msgid "Reference (track number)"
 msgstr ""
@@ -25423,11 +25544,11 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1800 build/trans_presets.java:1845
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:1801 build/trans_presets.java:1846
+#: build/trans_presets.java:2350
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -25436,5 +25557,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
 #. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1806
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
@@ -25442,5 +25563,5 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1810 build/trans_presets.java:2648
+#: build/trans_presets.java:1811 build/trans_presets.java:2649
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -25449,5 +25570,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -25456,5 +25577,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
 #. item "Public Transport/Bus Station" label "Edit Bus Station"
-#: build/trans_presets.java:1818
+#: build/trans_presets.java:1819
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -25462,5 +25583,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -25470,5 +25591,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
 #. item "Public Transport/Bus Stop" label "Edit Bus Stop"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1829
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
@@ -25477,6 +25598,6 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1833 build/trans_presets.java:2711
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:1834 build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -25488,10 +25609,10 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1834 build/trans_presets.java:2703
+#: build/trans_presets.java:1835 build/trans_presets.java:2704
 msgid "Bench"
 msgstr ""
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
 msgstr ""
@@ -25499,10 +25620,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1841
 msgid "Edit Bus Platform"
 msgstr ""
@@ -25510,10 +25631,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1849
 msgid "Ticket Machine"
 msgstr ""
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1855
 msgid "Reference Number"
 msgstr ""
@@ -25522,6 +25643,6 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1855 build/trans_presets.java:2662
-#: build/trans_presets.java:3823
+#: build/trans_presets.java:1856 build/trans_presets.java:2663
+#: build/trans_presets.java:3824
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -25530,6 +25651,6 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1856 build/trans_presets.java:2663
-#: build/trans_presets.java:3824
+#: build/trans_presets.java:1857 build/trans_presets.java:2664
+#: build/trans_presets.java:3825
 msgid "Notes"
 msgstr "الملاحظات"
@@ -25538,6 +25659,6 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1857 build/trans_presets.java:2664
-#: build/trans_presets.java:3825
+#: build/trans_presets.java:1858 build/trans_presets.java:2665
+#: build/trans_presets.java:3826
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25546,6 +25667,6 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1858 build/trans_presets.java:2665
-#: build/trans_presets.java:3826
+#: build/trans_presets.java:1859 build/trans_presets.java:2666
+#: build/trans_presets.java:3827
 msgid "Debit cards"
 msgstr ""
@@ -25554,6 +25675,6 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1859 build/trans_presets.java:2666
-#: build/trans_presets.java:3827
+#: build/trans_presets.java:1860 build/trans_presets.java:2667
+#: build/trans_presets.java:3828
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
@@ -25561,10 +25682,10 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1860 build/trans_presets.java:3828
+#: build/trans_presets.java:1861 build/trans_presets.java:3829
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Taxi"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Taxi"
 msgstr "تاكسي"
@@ -25572,5 +25693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1866
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -25578,10 +25699,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "مطار"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
 msgstr ""
@@ -25589,5 +25710,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1874
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25595,10 +25716,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1878
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1879
 msgid "ICAO"
 msgstr ""
@@ -25607,5 +25728,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr ""
@@ -25613,5 +25734,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1886
 msgid "Edit Runway"
 msgstr ""
@@ -25619,5 +25740,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr ""
@@ -25625,5 +25746,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1894
 msgid "Edit Taxiway"
 msgstr ""
@@ -25631,5 +25752,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr ""
@@ -25637,5 +25758,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1902
 msgid "Edit Helipad"
 msgstr ""
@@ -25645,5 +25766,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1907 build/trans_presets.java:1909
+#: build/trans_presets.java:1908 build/trans_presets.java:1910
 msgid "Apron"
 msgstr ""
@@ -25653,5 +25774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1912 build/trans_presets.java:1914
+#: build/trans_presets.java:1913 build/trans_presets.java:1915
 msgid "Hangar"
 msgstr ""
@@ -25662,6 +25783,6 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1917 build/trans_presets.java:1919
-#: build/trans_presets.java:3217
+#: build/trans_presets.java:1918 build/trans_presets.java:1920
+#: build/trans_presets.java:3218
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -25671,5 +25792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1922 build/trans_presets.java:1924
+#: build/trans_presets.java:1923 build/trans_presets.java:1925
 msgid "Windsock"
 msgstr ""
@@ -25678,5 +25799,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr ""
@@ -25684,10 +25805,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1931
 msgid "Edit Terminal"
 msgstr ""
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1935
 msgctxt "airport"
 msgid "Gate"
@@ -25696,15 +25817,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1937
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. group "Facilities"
-#: build/trans_presets.java:1942 build/trans_presets.java:2640
+#: build/trans_presets.java:1943 build/trans_presets.java:2641
 msgid "Facilities"
 msgstr ""
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1944
 msgid "Accommodation"
 msgstr ""
@@ -25716,5 +25837,5 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1944 build/trans_surveyor.java:43
+#: build/trans_presets.java:1945 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -25723,5 +25844,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1948
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
@@ -25735,8 +25856,8 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1951 build/trans_presets.java:1969
-#: build/trans_presets.java:1985 build/trans_presets.java:2002
-#: build/trans_presets.java:2020 build/trans_presets.java:2054
-#: build/trans_presets.java:2076 build/trans_presets.java:2099
+#: build/trans_presets.java:1952 build/trans_presets.java:1970
+#: build/trans_presets.java:1986 build/trans_presets.java:2003
+#: build/trans_presets.java:2021 build/trans_presets.java:2055
+#: build/trans_presets.java:2077 build/trans_presets.java:2100
 msgid "Stars"
 msgstr "النجوم"
@@ -25772,12 +25893,12 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1953 build/trans_presets.java:1971
-#: build/trans_presets.java:1987 build/trans_presets.java:2004
-#: build/trans_presets.java:2022 build/trans_presets.java:2039
-#: build/trans_presets.java:2056 build/trans_presets.java:2078
-#: build/trans_presets.java:2101 build/trans_presets.java:2120
-#: build/trans_presets.java:2137 build/trans_presets.java:2156
-#: build/trans_presets.java:2175 build/trans_presets.java:2191
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "Internet access"
 msgstr ""
@@ -25798,12 +25919,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1953 build/trans_presets.java:1971
-#: build/trans_presets.java:1987 build/trans_presets.java:2004
-#: build/trans_presets.java:2022 build/trans_presets.java:2039
-#: build/trans_presets.java:2056 build/trans_presets.java:2078
-#: build/trans_presets.java:2101 build/trans_presets.java:2120
-#: build/trans_presets.java:2137 build/trans_presets.java:2156
-#: build/trans_presets.java:2175 build/trans_presets.java:2191
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "wlan"
 msgstr ""
@@ -25824,12 +25945,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1953 build/trans_presets.java:1971
-#: build/trans_presets.java:1987 build/trans_presets.java:2004
-#: build/trans_presets.java:2022 build/trans_presets.java:2039
-#: build/trans_presets.java:2056 build/trans_presets.java:2078
-#: build/trans_presets.java:2101 build/trans_presets.java:2120
-#: build/trans_presets.java:2137 build/trans_presets.java:2156
-#: build/trans_presets.java:2175 build/trans_presets.java:2191
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209
 msgid "wired"
 msgstr ""
@@ -25856,12 +25977,12 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1953 build/trans_presets.java:1971
-#: build/trans_presets.java:1987 build/trans_presets.java:2004
-#: build/trans_presets.java:2022 build/trans_presets.java:2039
-#: build/trans_presets.java:2056 build/trans_presets.java:2078
-#: build/trans_presets.java:2101 build/trans_presets.java:2120
-#: build/trans_presets.java:2137 build/trans_presets.java:2156
-#: build/trans_presets.java:2175 build/trans_presets.java:2191
-#: build/trans_presets.java:2208 build/trans_style.java:1069
+#: build/trans_presets.java:1954 build/trans_presets.java:1972
+#: build/trans_presets.java:1988 build/trans_presets.java:2005
+#: build/trans_presets.java:2023 build/trans_presets.java:2040
+#: build/trans_presets.java:2057 build/trans_presets.java:2079
+#: build/trans_presets.java:2102 build/trans_presets.java:2121
+#: build/trans_presets.java:2138 build/trans_presets.java:2157
+#: build/trans_presets.java:2176 build/trans_presets.java:2192
+#: build/trans_presets.java:2209 build/trans_style.java:1084
 msgid "terminal"
 msgstr ""
@@ -25882,12 +26003,12 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1954 build/trans_presets.java:1972
-#: build/trans_presets.java:1988 build/trans_presets.java:2005
-#: build/trans_presets.java:2023 build/trans_presets.java:2040
-#: build/trans_presets.java:2057 build/trans_presets.java:2079
-#: build/trans_presets.java:2102 build/trans_presets.java:2121
-#: build/trans_presets.java:2138 build/trans_presets.java:2157
-#: build/trans_presets.java:2176 build/trans_presets.java:2192
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:1955 build/trans_presets.java:1973
+#: build/trans_presets.java:1989 build/trans_presets.java:2006
+#: build/trans_presets.java:2024 build/trans_presets.java:2041
+#: build/trans_presets.java:2058 build/trans_presets.java:2080
+#: build/trans_presets.java:2103 build/trans_presets.java:2122
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2177 build/trans_presets.java:2193
+#: build/trans_presets.java:2210
 msgid "Internet access fee"
 msgstr ""
@@ -25910,12 +26031,12 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1955 build/trans_presets.java:1973
-#: build/trans_presets.java:1989 build/trans_presets.java:2006
-#: build/trans_presets.java:2024 build/trans_presets.java:2041
-#: build/trans_presets.java:2058 build/trans_presets.java:2080
-#: build/trans_presets.java:2103 build/trans_presets.java:2122
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2177 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2225
+#: build/trans_presets.java:1956 build/trans_presets.java:1974
+#: build/trans_presets.java:1990 build/trans_presets.java:2007
+#: build/trans_presets.java:2025 build/trans_presets.java:2042
+#: build/trans_presets.java:2059 build/trans_presets.java:2081
+#: build/trans_presets.java:2104 build/trans_presets.java:2123
+#: build/trans_presets.java:2140 build/trans_presets.java:2159
+#: build/trans_presets.java:2178 build/trans_presets.java:2194
+#: build/trans_presets.java:2211 build/trans_presets.java:2226
 msgid "Smoking"
 msgstr ""
@@ -25937,12 +26058,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1955 build/trans_presets.java:1973
-#: build/trans_presets.java:1989 build/trans_presets.java:2006
-#: build/trans_presets.java:2024 build/trans_presets.java:2041
-#: build/trans_presets.java:2058 build/trans_presets.java:2080
-#: build/trans_presets.java:2103 build/trans_presets.java:2122
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2177 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2225
+#: build/trans_presets.java:1956 build/trans_presets.java:1974
+#: build/trans_presets.java:1990 build/trans_presets.java:2007
+#: build/trans_presets.java:2025 build/trans_presets.java:2042
+#: build/trans_presets.java:2059 build/trans_presets.java:2081
+#: build/trans_presets.java:2104 build/trans_presets.java:2123
+#: build/trans_presets.java:2140 build/trans_presets.java:2159
+#: build/trans_presets.java:2178 build/trans_presets.java:2194
+#: build/trans_presets.java:2211 build/trans_presets.java:2226
 msgid "dedicated"
 msgstr ""
@@ -25964,12 +26085,12 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1955 build/trans_presets.java:1973
-#: build/trans_presets.java:1989 build/trans_presets.java:2006
-#: build/trans_presets.java:2024 build/trans_presets.java:2041
-#: build/trans_presets.java:2058 build/trans_presets.java:2080
-#: build/trans_presets.java:2103 build/trans_presets.java:2122
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2177 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2225
+#: build/trans_presets.java:1956 build/trans_presets.java:1974
+#: build/trans_presets.java:1990 build/trans_presets.java:2007
+#: build/trans_presets.java:2025 build/trans_presets.java:2042
+#: build/trans_presets.java:2059 build/trans_presets.java:2081
+#: build/trans_presets.java:2104 build/trans_presets.java:2123
+#: build/trans_presets.java:2140 build/trans_presets.java:2159
+#: build/trans_presets.java:2178 build/trans_presets.java:2194
+#: build/trans_presets.java:2211 build/trans_presets.java:2226
 msgid "separated"
 msgstr ""
@@ -25991,17 +26112,17 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1955 build/trans_presets.java:1973
-#: build/trans_presets.java:1989 build/trans_presets.java:2006
-#: build/trans_presets.java:2024 build/trans_presets.java:2041
-#: build/trans_presets.java:2058 build/trans_presets.java:2080
-#: build/trans_presets.java:2103 build/trans_presets.java:2122
-#: build/trans_presets.java:2139 build/trans_presets.java:2158
-#: build/trans_presets.java:2177 build/trans_presets.java:2193
-#: build/trans_presets.java:2210 build/trans_presets.java:2225
+#: build/trans_presets.java:1956 build/trans_presets.java:1974
+#: build/trans_presets.java:1990 build/trans_presets.java:2007
+#: build/trans_presets.java:2025 build/trans_presets.java:2042
+#: build/trans_presets.java:2059 build/trans_presets.java:2081
+#: build/trans_presets.java:2104 build/trans_presets.java:2123
+#: build/trans_presets.java:2140 build/trans_presets.java:2159
+#: build/trans_presets.java:2178 build/trans_presets.java:2194
+#: build/trans_presets.java:2211 build/trans_presets.java:2226
 msgid "isolated"
 msgstr ""
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1964
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -26009,20 +26130,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "كوخ"
@@ -26030,10 +26151,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2000
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
 msgstr "نزل"
@@ -26041,15 +26162,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2017
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2033
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2034
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
@@ -26057,10 +26178,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
@@ -26068,30 +26189,30 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2062
 msgid "Number of places"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "Requires a fee"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "interval"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2064
 msgid "Power supply"
 msgstr ""
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2065
 msgid "Tents allowed"
 msgstr ""
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2072
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -26099,10 +26220,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -26113,5 +26234,5 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:2090 build/trans_surveyor.java:47
+#: build/trans_presets.java:2091 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -26119,5 +26240,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2093
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -26126,6 +26247,6 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
+#: build/trans_presets.java:2154
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -26133,5 +26254,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "italian"
 msgstr "إيطالي"
@@ -26139,5 +26260,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "chinese"
 msgstr "صيني"
@@ -26145,5 +26266,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
@@ -26151,5 +26272,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "burger"
 msgstr "هامبرغر"
@@ -26157,5 +26278,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "greek"
 msgstr "يوناني"
@@ -26163,5 +26284,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "german"
 msgstr "ألماني"
@@ -26169,5 +26290,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "indian"
 msgstr "هندي"
@@ -26175,5 +26296,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "regional"
 msgstr "محلي/إقليمي"
@@ -26181,5 +26302,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "kebab"
 msgstr "كباب / شورما"
@@ -26187,5 +26308,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "turkish"
 msgstr "تركي"
@@ -26193,5 +26314,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "asian"
 msgstr "آسيوي"
@@ -26199,5 +26320,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "thai"
 msgstr "تايلاندي"
@@ -26205,5 +26326,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "mexican"
 msgstr "مكسيكي"
@@ -26211,5 +26332,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "japanese"
 msgstr "ياباني"
@@ -26217,5 +26338,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "french"
 msgstr ""
@@ -26223,5 +26344,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "sandwich"
 msgstr ""
@@ -26229,5 +26350,5 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2096 build/trans_presets.java:2117
+#: build/trans_presets.java:2097 build/trans_presets.java:2118
 msgid "sushi"
 msgstr ""
@@ -26235,10 +26356,10 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:2097 build/trans_presets.java:2172
+#: build/trans_presets.java:2098 build/trans_presets.java:2173
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2112
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -26246,20 +26367,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "fish_and_chips"
 msgstr ""
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "chicken"
 msgstr ""
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2131
 msgid "Food Court"
 msgstr ""
@@ -26267,10 +26388,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2133
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2148
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -26278,15 +26399,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2150
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2167
 msgid "Pub"
 msgstr "حانة"
@@ -26294,20 +26415,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2169
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2186
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr "حانة"
@@ -26315,10 +26436,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2204
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2219
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -26326,25 +26447,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2221
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "سياحة"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -26352,10 +26473,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2244
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
@@ -26363,20 +26484,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr ""
@@ -26409,32 +26530,32 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2261 build/trans_presets.java:4401
-#: build/trans_style.java:477 build/trans_style.java:489
-#: build/trans_style.java:501 build/trans_style.java:507
+#: build/trans_presets.java:2262 build/trans_presets.java:4403
+#: build/trans_style.java:471 build/trans_style.java:483
+#: build/trans_style.java:495 build/trans_style.java:501
 msgid "street"
 msgstr "شارع"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr ""
@@ -26443,6 +26564,6 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2263 build/trans_presets.java:2279
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2264 build/trans_presets.java:2280
+#: build/trans_presets.java:2324
 msgid "Closer Description"
 msgstr ""
@@ -26452,5 +26573,5 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2265 build/trans_presets.java:2288
+#: build/trans_presets.java:2266 build/trans_presets.java:2289
 msgid "Routes shown for:"
 msgstr ""
@@ -26458,5 +26579,5 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2266 build/trans_presets.java:2289
+#: build/trans_presets.java:2267 build/trans_presets.java:2290
 msgid "Hiking"
 msgstr ""
@@ -26465,6 +26586,6 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2267 build/trans_presets.java:2290
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2268 build/trans_presets.java:2291
+#: build/trans_presets.java:2841
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -26472,5 +26593,5 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2268 build/trans_presets.java:2291
+#: build/trans_presets.java:2269 build/trans_presets.java:2292
 msgid "Mountainbiking"
 msgstr ""
@@ -26479,6 +26600,6 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2269 build/trans_presets.java:2292
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2270 build/trans_presets.java:2293
+#: build/trans_presets.java:2889
 msgid "Skiing"
 msgstr "تزلّج"
@@ -26486,5 +26607,5 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2270 build/trans_presets.java:2293
+#: build/trans_presets.java:2271 build/trans_presets.java:2294
 msgid "Riding"
 msgstr ""
@@ -26492,50 +26613,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2271 build/trans_presets.java:2294
+#: build/trans_presets.java:2272 build/trans_presets.java:2295
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "notice"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "history"
 msgstr "التاريخ"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "الطبيعة"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2282
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2297
 msgid "Information Terminal"
 msgstr ""
@@ -26543,10 +26664,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2301 build/trans_presets.java:2311
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
 msgid "Closer description"
 msgstr ""
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr ""
@@ -26554,25 +26675,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "سينما"
@@ -26581,10 +26702,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2331
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -26593,10 +26714,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -26605,45 +26726,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Dog Park"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Barrier"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "fence"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "wall"
 msgstr ""
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2355
 msgid "Theme Park"
 msgstr ""
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr ""
@@ -26653,5 +26774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2366 build/trans_presets.java:2369
+#: build/trans_presets.java:2367 build/trans_presets.java:2370
 msgid "Edit Sauna"
 msgstr ""
@@ -26679,20 +26800,20 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2374 build/trans_presets.java:2485
-#: build/trans_presets.java:2606 build/trans_presets.java:3440
-#: build/trans_presets.java:3449 build/trans_presets.java:3466
-#: build/trans_presets.java:3475 build/trans_presets.java:3512
-#: build/trans_presets.java:3561 build/trans_presets.java:3584
-#: build/trans_presets.java:3593 build/trans_presets.java:3640
-#: build/trans_presets.java:3649 build/trans_presets.java:3677
-#: build/trans_presets.java:3686 build/trans_presets.java:3725
-#: build/trans_presets.java:3741 build/trans_presets.java:3750
-#: build/trans_presets.java:3759 build/trans_presets.java:3775
-#: build/trans_presets.java:3797 build/trans_presets.java:3812
+#: build/trans_presets.java:2375 build/trans_presets.java:2486
+#: build/trans_presets.java:2607 build/trans_presets.java:3441
+#: build/trans_presets.java:3450 build/trans_presets.java:3467
+#: build/trans_presets.java:3476 build/trans_presets.java:3513
+#: build/trans_presets.java:3562 build/trans_presets.java:3585
+#: build/trans_presets.java:3594 build/trans_presets.java:3641
+#: build/trans_presets.java:3650 build/trans_presets.java:3678
+#: build/trans_presets.java:3687 build/trans_presets.java:3726
+#: build/trans_presets.java:3742 build/trans_presets.java:3751
+#: build/trans_presets.java:3760 build/trans_presets.java:3776
+#: build/trans_presets.java:3798 build/trans_presets.java:3813
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Access"
 msgstr ""
@@ -26700,5 +26821,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "ملعب"
@@ -26706,15 +26827,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2381
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
@@ -26722,10 +26843,10 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2388 build/trans_presets.java:2715
+#: build/trans_presets.java:2389 build/trans_presets.java:2716
 msgid "Fireplace"
 msgstr ""
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
 msgstr ""
@@ -26733,15 +26854,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2393
 msgid "Edit Public Grill"
 msgstr ""
 
-#. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2396
-msgid "Covered"
-msgstr ""
-
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgctxt "grill"
 msgid "Fuel"
@@ -26749,30 +26865,25 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "charcoal"
 msgstr ""
 
-#. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
-msgid "electric"
-msgstr ""
-
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2400
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. group "Culture"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2406
 msgid "Culture"
 msgstr ""
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Museum"
 msgstr "متحف"
@@ -26780,10 +26891,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "مسرح"
@@ -26792,10 +26903,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2418
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "مكتبة"
@@ -26804,10 +26915,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2425
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -26815,10 +26926,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -26826,10 +26937,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2438
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "معبد"
@@ -26839,5 +26950,5 @@
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
 #. item "Culture/Place of Worship" label "Edit Place of Worship"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2446
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -26846,6 +26957,6 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "Religion"
 msgstr "الديانة"
@@ -26854,6 +26965,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "bahai"
 msgstr "بهائي"
@@ -26862,6 +26973,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "buddhist"
 msgstr "بوذي"
@@ -26870,6 +26981,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "christian"
 msgstr "نصراني"
@@ -26878,6 +26989,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "hindu"
 msgstr "هندوس"
@@ -26886,6 +26997,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "jain"
 msgstr ""
@@ -26894,6 +27005,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "jewish"
 msgstr "يهودي"
@@ -26902,6 +27013,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "muslim"
 msgstr "مسلم"
@@ -26910,6 +27021,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "sikh"
 msgstr "سيخ"
@@ -26918,6 +27029,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "spiritualist"
 msgstr "روحاني"
@@ -26926,6 +27037,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "taoist"
 msgstr ""
@@ -26934,6 +27045,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "unitarian"
 msgstr ""
@@ -26942,6 +27053,6 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2448 build/trans_presets.java:4152
-#: build/trans_presets.java:4161
+#: build/trans_presets.java:2449 build/trans_presets.java:4153
+#: build/trans_presets.java:4162
 msgid "zoroastrian"
 msgstr ""
@@ -26950,6 +27061,6 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -26958,6 +27069,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "anglican"
 msgstr ""
@@ -26966,6 +27077,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "baptist"
 msgstr "معمداني"
@@ -26974,6 +27085,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "catholic"
 msgstr "كثليك"
@@ -26982,6 +27093,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "evangelical"
 msgstr "إنجيلي"
@@ -26990,6 +27101,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
@@ -26998,6 +27109,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "lutheran"
 msgstr "لوثري"
@@ -27006,6 +27117,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "methodist"
 msgstr "منهجي"
@@ -27014,6 +27125,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "mormon"
 msgstr ""
@@ -27022,6 +27133,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "orthodox"
 msgstr "أرثدكس"
@@ -27030,6 +27141,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "pentecostal"
 msgstr ""
@@ -27038,6 +27149,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "presbyterian"
 msgstr ""
@@ -27046,6 +27157,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "protestant"
 msgstr "بروتستاني"
@@ -27054,6 +27165,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "quaker"
 msgstr ""
@@ -27062,6 +27173,6 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "shia"
 msgstr "شيعي"
@@ -27070,36 +27181,36 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2449 build/trans_presets.java:4153
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:2450 build/trans_presets.java:4154
+#: build/trans_presets.java:4163
 msgid "sunni"
 msgstr "سنّي"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2451
 msgid "Service Times"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2451
 msgid "Su 10:00"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2451
 msgid "Su 10:30"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Service Times" display value
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2451
 msgid "Su 11:00"
 msgstr ""
 
 #. item "Culture/Place of Worship" combo "Opening Hours for visiting"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2452
 msgid "Opening Hours for visiting"
 msgstr ""
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Recording Studio"
 msgstr ""
@@ -27107,15 +27218,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2456
 msgid "Edit Studio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "audio"
 msgstr ""
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "video"
 msgstr ""
@@ -27123,5 +27234,5 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2465 build/trans_presets.java:2466
+#: build/trans_presets.java:2466 build/trans_presets.java:2467
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -27129,10 +27240,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -27140,5 +27251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2475
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
@@ -27147,10 +27258,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2478 build/trans_presets.java:2480
+#: build/trans_presets.java:2479 build/trans_presets.java:2481
 msgid "Community Centre"
 msgstr ""
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2488
 msgid "Embassy"
 msgstr "سفارة"
@@ -27158,10 +27269,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2490
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "محكمة"
@@ -27170,10 +27281,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "سجن"
@@ -27182,10 +27293,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2504
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "شرطة"
@@ -27195,10 +27306,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -27207,10 +27318,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2519
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -27218,25 +27329,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
 
 #. group "Education"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2531
 msgid "Education"
 msgstr ""
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2532
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "مدرسة"
@@ -27244,10 +27355,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2539
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "جامعة"
@@ -27255,10 +27366,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2545
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "كلّية"
@@ -27266,10 +27377,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2551
 msgid "Edit College"
 msgstr "حرّر كلّية"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr ""
@@ -27277,20 +27388,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Edit Driving School"
 msgstr ""
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2562
 msgid "License Classes"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Health"
 msgstr "صحة"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "مستشفى"
@@ -27298,10 +27409,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2568
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "أطباء"
@@ -27309,25 +27420,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2574
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2585
 msgid "Nursing Home"
 msgstr ""
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2586
 msgid "Edit Nursing Home"
 msgstr ""
@@ -27335,5 +27446,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -27341,5 +27452,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2594
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -27347,10 +27458,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2596
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2600
 msgid "Hearing Aids"
 msgstr ""
@@ -27358,5 +27469,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2602
 msgid "Edit Hearing Aids"
 msgstr ""
@@ -27364,5 +27475,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr ""
@@ -27370,5 +27481,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2612
 msgid "Edit Baby Hatch"
 msgstr ""
@@ -27376,5 +27487,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -27383,5 +27494,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2621
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -27390,15 +27501,15 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2624
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2625
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2628
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -27407,5 +27518,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "بيطري"
@@ -27414,10 +27525,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2635
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr ""
@@ -27425,15 +27536,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2649 build/trans_presets.java:3822
+#: build/trans_presets.java:2650 build/trans_presets.java:3823
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "هاتف"
@@ -27442,15 +27553,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2660
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr ""
@@ -27459,5 +27570,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2673
 msgid "Edit Clock"
 msgstr ""
@@ -27467,5 +27578,5 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2675 build/trans_presets.java:3239
+#: build/trans_presets.java:2676 build/trans_presets.java:3240
 msgid "Display"
 msgstr ""
@@ -27473,5 +27584,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2675 build/trans_presets.java:3239
+#: build/trans_presets.java:2676 build/trans_presets.java:3240
 msgctxt "display"
 msgid "analog"
@@ -27480,5 +27591,5 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2675 build/trans_presets.java:3239
+#: build/trans_presets.java:2676 build/trans_presets.java:3240
 msgctxt "display"
 msgid "digital"
@@ -27486,5 +27597,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -27492,5 +27603,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -27498,60 +27609,55 @@
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "Support"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
-msgid "pole"
+#: build/trans_presets.java:2677
+msgid "wall_mounted"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
-msgid "wall_mounted"
-msgstr ""
-
-#. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "billboard"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "Visibility/readability"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 5m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(more than 20m)"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2679
 msgid "Shows current date"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2680
 msgid "Shows temperature"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2681
 msgid "Shows barometric pressure"
 msgstr ""
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2682
 msgid "Shows humidity"
 msgstr ""
@@ -27559,5 +27665,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -27566,5 +27672,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2688
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -27572,40 +27678,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "container"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "centre"
 msgstr ""
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2698
 msgid "Waste Basket"
 msgstr ""
@@ -27613,5 +27719,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2700
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27620,30 +27726,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2707
 msgid "Backrest"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "Material"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "stone"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "plastic"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgid "Colour"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "black"
@@ -27651,5 +27757,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -27657,5 +27763,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -27663,5 +27769,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -27669,5 +27775,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -27675,5 +27781,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -27681,5 +27787,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -27687,20 +27793,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2710
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgid "Type of shelter"
 msgstr ""
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -27708,5 +27814,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "public_transport"
@@ -27714,5 +27820,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -27720,5 +27826,5 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -27726,10 +27832,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27738,10 +27844,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2721 build/trans_presets.java:4013
+#: build/trans_presets.java:2722 build/trans_presets.java:4014
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -27749,20 +27855,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr "نصف"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr "ملء"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "مخبئ"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr ""
@@ -27770,5 +27876,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -27777,10 +27883,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr ""
@@ -27789,5 +27895,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2738
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27795,5 +27901,5 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2739 build/trans_presets.java:3137
+#: build/trans_presets.java:2740 build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underground"
@@ -27801,5 +27907,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -27807,5 +27913,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -27813,16 +27919,16 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pond"
 msgstr ""
 
-#. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2740
-msgid "Diameter"
+#. item "Facilities/Fire Hydrant" combo "Diameter (in mm)"
+#: build/trans_presets.java:2741
+msgid "Diameter (in mm)"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "lane"
@@ -27830,5 +27936,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -27836,5 +27942,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27842,26 +27948,21 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "green"
 msgstr ""
 
-#. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2747
-msgid "Pressure"
-msgstr ""
-
-#. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2747
-msgid "xx l/min"
-msgstr ""
-
-#. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2747
+#. item "Facilities/Fire Hydrant" combo "Pressure (in bar)"
+#: build/trans_presets.java:2748
+msgid "Pressure (in bar)"
+msgstr ""
+
+#. item "Facilities/Fire Hydrant" combo "Pressure (in bar)" display value
+#: build/trans_presets.java:2748
 msgid "suction"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2749
 msgid "Count"
 msgstr ""
@@ -27869,20 +27970,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2752 build/trans_presets.java:3527
+#: build/trans_presets.java:2753 build/trans_presets.java:3528
 msgid "Sports"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -27896,6 +27997,6 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2759 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2760 build/trans_presets.java:2769
+#: build/trans_presets.java:2778 build/trans_presets.java:2787
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -28241,34 +28342,34 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
-#: build/trans_style.java:3107 build/trans_style.java:3113
-#: build/trans_style.java:3119 build/trans_style.java:3125
-#: build/trans_style.java:3131 build/trans_style.java:3137
-#: build/trans_style.java:3143 build/trans_style.java:3149
-#: build/trans_style.java:3155 build/trans_style.java:3161
-#: build/trans_style.java:3167 build/trans_style.java:3173
-#: build/trans_style.java:3179 build/trans_style.java:3185
-#: build/trans_style.java:3191 build/trans_style.java:3197
-#: build/trans_style.java:3203 build/trans_style.java:3209
-#: build/trans_style.java:3215 build/trans_style.java:3221
-#: build/trans_style.java:3227 build/trans_style.java:3233
-#: build/trans_style.java:3239 build/trans_style.java:3245
-#: build/trans_style.java:3251 build/trans_style.java:3257
-#: build/trans_style.java:3263 build/trans_style.java:3269
-#: build/trans_style.java:3275 build/trans_style.java:3281
-#: build/trans_style.java:3287 build/trans_style.java:3293
-#: build/trans_style.java:3299 build/trans_style.java:3305
-#: build/trans_style.java:3311 build/trans_style.java:3317
-#: build/trans_style.java:3323 build/trans_style.java:3329
-#: build/trans_style.java:3335 build/trans_style.java:3341
-#: build/trans_style.java:3347 build/trans_style.java:3353
-#: build/trans_style.java:3359 build/trans_style.java:3365
-#: build/trans_style.java:3371 build/trans_style.java:3377
-#: build/trans_style.java:3383 build/trans_style.java:3389
-#: build/trans_style.java:3395 build/trans_style.java:3401
-#: build/trans_style.java:3407 build/trans_style.java:3413
-#: build/trans_style.java:3419 build/trans_style.java:3425
-#: build/trans_style.java:3431
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
+#: build/trans_style.java:3122 build/trans_style.java:3128
+#: build/trans_style.java:3134 build/trans_style.java:3140
+#: build/trans_style.java:3146 build/trans_style.java:3152
+#: build/trans_style.java:3158 build/trans_style.java:3164
+#: build/trans_style.java:3170 build/trans_style.java:3176
+#: build/trans_style.java:3182 build/trans_style.java:3188
+#: build/trans_style.java:3194 build/trans_style.java:3200
+#: build/trans_style.java:3206 build/trans_style.java:3212
+#: build/trans_style.java:3218 build/trans_style.java:3224
+#: build/trans_style.java:3230 build/trans_style.java:3236
+#: build/trans_style.java:3242 build/trans_style.java:3248
+#: build/trans_style.java:3254 build/trans_style.java:3260
+#: build/trans_style.java:3266 build/trans_style.java:3272
+#: build/trans_style.java:3278 build/trans_style.java:3284
+#: build/trans_style.java:3290 build/trans_style.java:3296
+#: build/trans_style.java:3302 build/trans_style.java:3308
+#: build/trans_style.java:3314 build/trans_style.java:3320
+#: build/trans_style.java:3326 build/trans_style.java:3332
+#: build/trans_style.java:3338 build/trans_style.java:3344
+#: build/trans_style.java:3350 build/trans_style.java:3356
+#: build/trans_style.java:3362 build/trans_style.java:3368
+#: build/trans_style.java:3374 build/trans_style.java:3380
+#: build/trans_style.java:3386 build/trans_style.java:3392
+#: build/trans_style.java:3398 build/trans_style.java:3404
+#: build/trans_style.java:3410 build/trans_style.java:3416
+#: build/trans_style.java:3422 build/trans_style.java:3428
+#: build/trans_style.java:3434 build/trans_style.java:3440
+#: build/trans_style.java:3446
 msgid "sport"
 msgstr "الرياضة"
@@ -28278,6 +28379,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "multi"
 msgstr "متعدد"
@@ -28287,6 +28388,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "archery"
 msgstr "أسلحة الرماية"
@@ -28296,6 +28397,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "athletics"
 msgstr ""
@@ -28305,6 +28406,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "american_football"
 msgstr ""
@@ -28314,6 +28415,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
@@ -28323,6 +28424,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "baseball"
 msgstr "كرة المضرب"
@@ -28332,6 +28433,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "basketball"
 msgstr "كرة السلّة"
@@ -28341,6 +28442,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "boules"
 msgstr ""
@@ -28350,6 +28451,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "bowls"
 msgstr ""
@@ -28359,6 +28460,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "canadian_football"
 msgstr ""
@@ -28368,6 +28469,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "canoe"
 msgstr ""
@@ -28377,6 +28478,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "climbing"
 msgstr "التسلق"
@@ -28386,6 +28487,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "cricket"
 msgstr ""
@@ -28395,6 +28496,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "cricket_nets"
 msgstr ""
@@ -28404,6 +28505,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "croquet"
 msgstr ""
@@ -28413,6 +28514,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "cycling"
 msgstr "ركوب الدراجة"
@@ -28422,6 +28523,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "dog_racing"
 msgstr "سبق الكلاب"
@@ -28431,6 +28532,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "equestrian"
 msgstr "ركوب الخيل"
@@ -28440,6 +28541,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "gaelic_football"
 msgstr ""
@@ -28449,6 +28550,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "golf"
 msgstr ""
@@ -28458,6 +28559,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "gymnastics"
 msgstr "الجمباز"
@@ -28467,6 +28568,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "hockey"
 msgstr ""
@@ -28476,6 +28577,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "horse_racing"
 msgstr "سبق الخيل"
@@ -28485,6 +28586,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "motor"
 msgstr "رياضة المحركات"
@@ -28494,6 +28595,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "pelota"
 msgstr ""
@@ -28503,6 +28604,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "racquet"
 msgstr ""
@@ -28512,6 +28613,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "rugby_league"
 msgstr ""
@@ -28521,6 +28622,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "rugby_union"
 msgstr ""
@@ -28530,6 +28631,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "shooting"
 msgstr ""
@@ -28539,6 +28640,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "skateboard"
 msgstr ""
@@ -28548,6 +28649,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "skating"
 msgstr ""
@@ -28557,6 +28658,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "skiing"
 msgstr "التزلج"
@@ -28566,6 +28667,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "soccer"
 msgstr "كرة القدم"
@@ -28575,6 +28676,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "swimming"
 msgstr "السباحة"
@@ -28584,6 +28685,6 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "table_tennis"
 msgstr "تنس الطاولة"
@@ -28593,71 +28694,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "tennis"
 msgstr "التنس"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2764
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2765
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2792
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2797
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2798
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "رياضة"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2805
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
 msgstr ""
@@ -28705,25 +28806,25 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2808 build/trans_presets.java:2814
-#: build/trans_presets.java:2820 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2850
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2895 build/trans_presets.java:2902
-#: build/trans_presets.java:2910 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2928
-#: build/trans_presets.java:2934 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2952
-#: build/trans_presets.java:2958 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3050 build/trans_presets.java:3056
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2827
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2887
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2911 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2929
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2953
+#: build/trans_presets.java:2959 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3069
+#: build/trans_presets.java:3076 build/trans_presets.java:3082
 msgid "type"
 msgstr "النوع"
@@ -28773,26 +28874,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2808 build/trans_presets.java:2814
-#: build/trans_presets.java:2820 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2850
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2895 build/trans_presets.java:2902
-#: build/trans_presets.java:2910 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2928
-#: build/trans_presets.java:2934 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2952
-#: build/trans_presets.java:2958 build/trans_presets.java:2967
-#: build/trans_presets.java:2976 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3050 build/trans_presets.java:3056
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2827
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2887
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2911 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2929
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2953
+#: build/trans_presets.java:2959 build/trans_presets.java:2968
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3069
+#: build/trans_presets.java:3076 build/trans_presets.java:3082
 msgid "pitch"
 msgstr ""
@@ -28842,26 +28943,26 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2808 build/trans_presets.java:2814
-#: build/trans_presets.java:2820 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2850
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2895 build/trans_presets.java:2902
-#: build/trans_presets.java:2910 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2928
-#: build/trans_presets.java:2934 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2952
-#: build/trans_presets.java:2958 build/trans_presets.java:2967
-#: build/trans_presets.java:2976 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3050 build/trans_presets.java:3056
-#: build/trans_presets.java:3062 build/trans_presets.java:3068
-#: build/trans_presets.java:3075 build/trans_presets.java:3081
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2827
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2887
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2911 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2929
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2953
+#: build/trans_presets.java:2959 build/trans_presets.java:2968
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3069
+#: build/trans_presets.java:3076 build/trans_presets.java:3082
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
@@ -28906,149 +29007,149 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2808 build/trans_presets.java:2814
-#: build/trans_presets.java:2820 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2850
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2895 build/trans_presets.java:2902
-#: build/trans_presets.java:2910 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2928
-#: build/trans_presets.java:2934 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2952
-#: build/trans_presets.java:2958 build/trans_presets.java:2967
-#: build/trans_presets.java:2976 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2827
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2887
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2911 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2929
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2953
+#: build/trans_presets.java:2959 build/trans_presets.java:2968
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3051
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2811
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -29056,60 +29157,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2891
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "نزولاً"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "شمالي"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "مبتدئ"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "سهل"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "expert"
 msgstr "خبير"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "freeride"
 msgstr ""
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "رماية"
@@ -29117,105 +29218,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit American Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2925
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2931
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2937
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2943
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2949
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr ""
@@ -29223,10 +29324,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2963
 msgid "Edit Volleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "Beachvolleyball"
 msgstr ""
@@ -29234,120 +29335,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2972
 msgid "Edit Beachvolleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2980
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3021
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3022
 msgid "Edit Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3027
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3028
 msgid "Edit Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3039
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3040
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
@@ -29355,40 +29456,40 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:3045 build/trans_presets.java:3046
+#: build/trans_presets.java:3046 build/trans_presets.java:3047
 msgid "Motorsport"
 msgstr ""
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3048
 msgid "Edit Motorsport"
 msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3053
 msgid "Karting"
 msgstr ""
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3054
 msgid "Edit Karting"
 msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3059
 msgid "Motocross"
 msgstr ""
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3060
 msgid "Edit Motocross"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3065
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3066
 msgid "Edit Safety Training"
 msgstr ""
@@ -29396,20 +29497,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3072
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3073
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3078
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3079
 msgid "Edit RC Car"
 msgstr ""
@@ -29417,10 +29518,10 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:3085 build/trans_presets.java:3086
+#: build/trans_presets.java:3086 build/trans_presets.java:3087
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "مبنى"
@@ -29428,25 +29529,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3091
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "communication"
 msgstr ""
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "observation"
 msgstr ""
@@ -29455,5 +29556,5 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:3096 build/trans_presets.java:3117
+#: build/trans_presets.java:3097 build/trans_presets.java:3118
 msgid "Height (meters)"
 msgstr ""
@@ -29461,5 +29562,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr ""
@@ -29469,15 +29570,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr ""
@@ -29485,10 +29586,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3113
 msgid "Edit Chimney"
 msgstr ""
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3120
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -29496,20 +29597,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3122
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -29518,5 +29619,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
 #. item "Man Made/Man Made/Pipeline" label "Edit Pipeline"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3134
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
@@ -29560,8 +29661,8 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:3136 build/trans_style.java:817
-#: build/trans_style.java:830 build/trans_style.java:842
-#: build/trans_style.java:847 build/trans_style.java:2936
-#: build/trans_style.java:2942
+#: build/trans_presets.java:3137 build/trans_style.java:811
+#: build/trans_style.java:824 build/trans_style.java:836
+#: build/trans_style.java:841 build/trans_style.java:2951
+#: build/trans_style.java:2957
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
@@ -29571,10 +29672,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3136 build/trans_presets.java:3263
+#: build/trans_presets.java:3137 build/trans_presets.java:3264
 msgid "gas"
 msgstr "غاز"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr ""
@@ -29582,20 +29683,20 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3136 build/trans_presets.java:3263
+#: build/trans_presets.java:3137 build/trans_presets.java:3264
 msgid "oil"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "sewage"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgid "Location"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underwater"
@@ -29603,5 +29704,5 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "overground"
@@ -29609,5 +29710,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "ونش"
@@ -29615,10 +29716,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3142
 msgid "Edit Crane"
 msgstr "حرّر ونش"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr ""
@@ -29627,25 +29728,25 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Man Made/Mineshaft" label "Edit Mineshaft"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3149
 msgid "Edit Mineshaft"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "Function"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "winding"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "air"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3153
 msgid "Depth in meters"
 msgstr ""
@@ -29653,5 +29754,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "Resource"
 msgstr ""
@@ -29659,5 +29760,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "aggregate"
 msgstr ""
@@ -29665,5 +29766,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "bauxite"
 msgstr ""
@@ -29672,6 +29773,6 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
+#: build/trans_presets.java:3264
 msgid "coal"
 msgstr "فحم"
@@ -29679,5 +29780,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "copper"
 msgstr ""
@@ -29685,5 +29786,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "dimension_stone"
 msgstr ""
@@ -29691,5 +29792,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "gold"
 msgstr ""
@@ -29697,5 +29798,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "ilmenite"
 msgstr ""
@@ -29703,5 +29804,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "iron_ore"
 msgstr ""
@@ -29709,5 +29810,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "lead"
 msgstr ""
@@ -29715,5 +29816,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "limestone"
 msgstr ""
@@ -29721,5 +29822,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "nickel"
 msgstr ""
@@ -29727,5 +29828,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "rutile"
 msgstr ""
@@ -29733,5 +29834,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "salt"
 msgstr ""
@@ -29739,5 +29840,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "silver"
 msgstr ""
@@ -29745,5 +29846,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "tin"
 msgstr ""
@@ -29751,5 +29852,5 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "zinc"
 msgstr ""
@@ -29757,10 +29858,10 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:3154 build/trans_presets.java:3165
+#: build/trans_presets.java:3155 build/trans_presets.java:3166
 msgid "zircon"
 msgstr ""
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3156
 msgid "Visible Headframe"
 msgstr ""
@@ -29768,10 +29869,10 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:3156 build/trans_presets.java:3166
+#: build/trans_presets.java:3157 build/trans_presets.java:3167
 msgid "Disused"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3159
 msgid "Adit"
 msgstr ""
@@ -29779,10 +29880,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3161
 msgid "Edit Adit"
 msgstr ""
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3164
 msgid "Length in meters"
 msgstr ""
@@ -29790,15 +29891,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3171
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr ""
@@ -29806,10 +29907,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works" />
 #. item "Man Made/Man Made/Water Works" label "Edit Water Works"
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3177
 msgid "Edit Water Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3183
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -29819,10 +29920,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3187
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr ""
@@ -29830,10 +29931,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3193
 msgid "Edit Watermill"
 msgstr ""
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3198
 msgid "Fountain"
 msgstr "نافورة"
@@ -29842,10 +29943,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3201
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr ""
@@ -29853,5 +29954,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well" />
 #. item "Man Made/Man Made/Water Well" label "Edit Water Well"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3207
 msgid "Edit Water Well"
 msgstr ""
@@ -29859,5 +29960,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "منارة"
@@ -29865,5 +29966,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3214
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
@@ -29871,10 +29972,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3220
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3224
 msgid "Street Lamp"
 msgstr ""
@@ -29882,5 +29983,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp" />
 #. item "Man Made/Man Made/Street Lamp" label "Edit Street Lamp"
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3226
 msgid "Edit Street Lamp"
 msgstr ""
@@ -29889,15 +29990,15 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3229
 msgid "Operation times"
 msgstr ""
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3229
 msgid "Mo-Fr 22:00-05:00"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3231
 msgid "Measurement Station"
 msgstr ""
@@ -29905,55 +30006,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
 #. item "Man Made/Man Made/Measurement Station" label "Edit Measurement Station"
-#: build/trans_presets.java:3232
+#: build/trans_presets.java:3233
 msgid "Edit Measurement Station"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "Measurement"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "particulate_matter"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "seismic"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "water_level"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "weather"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "Recording"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "manually"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "automated"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "remote"
 msgstr ""
 
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:3239
+#: build/trans_presets.java:3240
 msgctxt "display"
 msgid "no"
@@ -29961,5 +30062,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -29967,10 +30068,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
 #. item "Man Made/Man Made/Survey Point" label "Edit Survey Point"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3244
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3248
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -29978,30 +30079,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3250
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "indoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "outdoor"
 msgstr ""
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "public"
 msgstr ""
 
 #. group "Power"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3256
 msgid "Power"
 msgstr ""
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3257
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -30011,140 +30112,140 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3261
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biofuel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biogas"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biomass"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "diesel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "gasoline"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "geothermal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "hydro"
 msgstr "مائية"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "نووية"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "osmotic"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "solar"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "tidal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "waste"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wave"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wind"
 msgstr "أرياح"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "Method"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "anaerobic_digestion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "combustion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "dam"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fission"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fusion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "gasification"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumped-storage"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumping"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pyrolysis"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "run-of-the-river"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "thermal"
 msgstr ""
@@ -30152,10 +30253,10 @@
 #. <space />
 #. item "Power/Power Generator" label "Output forms of energy"
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3267
 msgid "Output forms of energy"
 msgstr ""
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3268
 msgid "electricity"
 msgstr ""
@@ -30170,9 +30271,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3267 build/trans_presets.java:3268
-#: build/trans_presets.java:3269 build/trans_presets.java:3270
-#: build/trans_presets.java:3271 build/trans_presets.java:3272
-#: build/trans_presets.java:3273 build/trans_presets.java:3274
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3268 build/trans_presets.java:3269
+#: build/trans_presets.java:3270 build/trans_presets.java:3271
+#: build/trans_presets.java:3272 build/trans_presets.java:3273
+#: build/trans_presets.java:3274 build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 msgid "2 W"
 msgstr ""
@@ -30187,9 +30288,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3267 build/trans_presets.java:3268
-#: build/trans_presets.java:3269 build/trans_presets.java:3270
-#: build/trans_presets.java:3271 build/trans_presets.java:3272
-#: build/trans_presets.java:3273 build/trans_presets.java:3274
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3268 build/trans_presets.java:3269
+#: build/trans_presets.java:3270 build/trans_presets.java:3271
+#: build/trans_presets.java:3272 build/trans_presets.java:3273
+#: build/trans_presets.java:3274 build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 msgid "3 kW"
 msgstr ""
@@ -30204,9 +30305,9 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3267 build/trans_presets.java:3268
-#: build/trans_presets.java:3269 build/trans_presets.java:3270
-#: build/trans_presets.java:3271 build/trans_presets.java:3272
-#: build/trans_presets.java:3273 build/trans_presets.java:3274
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3268 build/trans_presets.java:3269
+#: build/trans_presets.java:3270 build/trans_presets.java:3271
+#: build/trans_presets.java:3272 build/trans_presets.java:3273
+#: build/trans_presets.java:3274 build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 msgid "5 MW"
 msgstr ""
@@ -30221,54 +30322,54 @@
 #. item "Power/Power Generator" combo "vacuum" display value
 #. item "Power/Power Generator" combo "battery charging" display value
-#: build/trans_presets.java:3267 build/trans_presets.java:3268
-#: build/trans_presets.java:3269 build/trans_presets.java:3270
-#: build/trans_presets.java:3271 build/trans_presets.java:3272
-#: build/trans_presets.java:3273 build/trans_presets.java:3274
+#: build/trans_presets.java:3268 build/trans_presets.java:3269
+#: build/trans_presets.java:3270 build/trans_presets.java:3271
+#: build/trans_presets.java:3272 build/trans_presets.java:3273
+#: build/trans_presets.java:3274 build/trans_presets.java:3275
+#: build/trans_presets.java:3276
+msgid "7 GW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "hot water"
+#: build/trans_presets.java:3269
+msgid "hot water"
+msgstr ""
+
+#. item "Power/Power Generator" combo "hot air"
+#: build/trans_presets.java:3270
+msgid "hot air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "cold water"
+#: build/trans_presets.java:3271
+msgid "cold water"
+msgstr ""
+
+#. item "Power/Power Generator" combo "cold air"
+#: build/trans_presets.java:3272
+msgid "cold air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "compressed air"
+#: build/trans_presets.java:3273
+msgid "compressed air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "steam"
+#: build/trans_presets.java:3274
+msgid "steam"
+msgstr ""
+
+#. item "Power/Power Generator" combo "vacuum"
 #: build/trans_presets.java:3275
-msgid "7 GW"
-msgstr ""
-
-#. item "Power/Power Generator" combo "hot water"
-#: build/trans_presets.java:3268
-msgid "hot water"
-msgstr ""
-
-#. item "Power/Power Generator" combo "hot air"
-#: build/trans_presets.java:3269
-msgid "hot air"
-msgstr ""
-
-#. item "Power/Power Generator" combo "cold water"
-#: build/trans_presets.java:3270
-msgid "cold water"
-msgstr ""
-
-#. item "Power/Power Generator" combo "cold air"
-#: build/trans_presets.java:3271
-msgid "cold air"
-msgstr ""
-
-#. item "Power/Power Generator" combo "compressed air"
-#: build/trans_presets.java:3272
-msgid "compressed air"
-msgstr ""
-
-#. item "Power/Power Generator" combo "steam"
-#: build/trans_presets.java:3273
-msgid "steam"
-msgstr ""
-
-#. item "Power/Power Generator" combo "vacuum"
-#: build/trans_presets.java:3274
 msgid "vacuum"
 msgstr ""
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 msgid "battery charging"
 msgstr ""
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3278
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -30277,10 +30378,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3281
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -30289,5 +30390,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
 #. item "Power/Power Sub Station" label "Edit Power Sub Station"
-#: build/trans_presets.java:3289
+#: build/trans_presets.java:3290
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -30295,10 +30396,10 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3292 build/trans_presets.java:3325
+#: build/trans_presets.java:3293 build/trans_presets.java:3326
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -30307,5 +30408,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dcable_distribution_cabinet" />
 #. item "Power/Cable Distribution Cabinet" label "Edit Cable Distribution Cabinet"
-#: build/trans_presets.java:3297
+#: build/trans_presets.java:3298
 msgid "Edit Cable Distribution Cabinet"
 msgstr ""
@@ -30313,5 +30414,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -30322,5 +30423,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3308
+#: build/trans_presets.java:3309
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
@@ -30328,10 +30429,10 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3310
+#: build/trans_presets.java:3311
 msgid "Tower reference"
 msgstr ""
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3312
+#: build/trans_presets.java:3313
 msgid "Pole"
 msgstr ""
@@ -30340,5 +30441,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3316
 msgid "Edit Power Pole"
 msgstr ""
@@ -30346,10 +30447,10 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3317
+#: build/trans_presets.java:3318
 msgid "Pole reference"
 msgstr ""
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3320
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -30358,15 +30459,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3322
+#: build/trans_presets.java:3323
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgid "Line type"
 msgstr ""
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "line"
@@ -30374,5 +30475,5 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "minor_line"
@@ -30380,40 +30481,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3329
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "single"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "double"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "triple"
 msgstr ""
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "quad"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:3332
+#: build/trans_presets.java:3333
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "قلعة"
@@ -30422,20 +30523,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3336
+#: build/trans_presets.java:3337
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -30444,10 +30545,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3351
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -30455,10 +30556,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3357
+#: build/trans_presets.java:3358
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
 msgstr ""
@@ -30466,5 +30567,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3363
+#: build/trans_presets.java:3364
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -30472,15 +30573,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3370
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "ضريح"
@@ -30488,60 +30589,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3375
+#: build/trans_presets.java:3376
 msgid "Edit Memorial"
 msgstr "حرّر ضريح"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3398
 msgid "Food"
 msgstr ""
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3399
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
 msgstr ""
@@ -30549,10 +30650,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3407
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "كشك"
@@ -30560,5 +30661,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3414
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
@@ -30566,5 +30667,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "خباز"
@@ -30572,10 +30673,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3421
+#: build/trans_presets.java:3422
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "جزار"
@@ -30583,10 +30684,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3428
+#: build/trans_presets.java:3429
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr ""
@@ -30594,10 +30695,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3435
+#: build/trans_presets.java:3436
 msgid "Edit Seafood"
 msgstr ""
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3443
 msgid "Deli (Fine Food)"
 msgstr ""
@@ -30605,10 +30706,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"/>
 #. item "Shops/Food/Deli (Fine Food)" label "Edit Deli (Fine Food)"
-#: build/trans_presets.java:3444
+#: build/trans_presets.java:3445
 msgid "Edit Deli (Fine Food)"
 msgstr ""
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3451
+#: build/trans_presets.java:3452
 msgid "Confectionery"
 msgstr ""
@@ -30616,5 +30717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:3454
 msgid "Edit Confectionery"
 msgstr ""
@@ -30622,5 +30723,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr ""
@@ -30628,10 +30729,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3462
 msgid "Edit Marketplace"
 msgstr ""
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3468
+#: build/trans_presets.java:3469
 msgid "Greengrocer"
 msgstr ""
@@ -30639,15 +30740,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3470
+#: build/trans_presets.java:3471
 msgid "Edit Greengrocer"
 msgstr ""
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3477
+#: build/trans_presets.java:3478
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
@@ -30655,5 +30756,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr ""
@@ -30661,25 +30762,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3486
+#: build/trans_presets.java:3487
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3491
+#: build/trans_presets.java:3492
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3493
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3501
 msgid "Edit Clothes Shop"
 msgstr ""
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3505
+#: build/trans_presets.java:3506
 msgid "Boutique"
 msgstr ""
@@ -30687,20 +30788,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3508
 msgid "Edit Boutique"
 msgstr ""
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3514
+#: build/trans_presets.java:3515
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -30708,10 +30809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3522
+#: build/trans_presets.java:3523
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
@@ -30719,5 +30820,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -30725,10 +30826,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3537
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -30736,20 +30837,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3544
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3548
+#: build/trans_presets.java:3549
 msgid "Tailor"
 msgstr ""
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3550
 msgid "Edit Tailor"
 msgstr ""
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3554
+#: build/trans_presets.java:3555
 msgid "Fabric"
 msgstr ""
@@ -30757,35 +30858,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3556
+#: build/trans_presets.java:3557
 msgid "Edit Fabric"
 msgstr ""
 
 #. group "Electronic"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3565
 msgid "Electronic"
 msgstr ""
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3566
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr ""
@@ -30793,10 +30894,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3579
+#: build/trans_presets.java:3580
 msgid "Edit Mobile Phone"
 msgstr ""
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3587
 msgid "Vacuum Cleaner"
 msgstr ""
@@ -30804,35 +30905,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3589
 msgid "Edit Vacuum Cleaner"
 msgstr ""
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3596
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3602
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:3603
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
 #. group "Cash"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3609
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "مصرف"
@@ -30840,5 +30941,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3611
+#: build/trans_presets.java:3612
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
@@ -30846,10 +30947,10 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3616 build/trans_presets.java:3625
+#: build/trans_presets.java:3617 build/trans_presets.java:3626
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -30857,5 +30958,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3620
+#: build/trans_presets.java:3621
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -30863,10 +30964,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3627
+#: build/trans_presets.java:3628
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr ""
@@ -30874,10 +30975,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3635
+#: build/trans_presets.java:3636
 msgid "Edit Department Store"
 msgstr ""
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3642
+#: build/trans_presets.java:3643
 msgid "Mall"
 msgstr ""
@@ -30885,5 +30986,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3644
+#: build/trans_presets.java:3645
 msgid "Edit Mall"
 msgstr ""
@@ -30891,35 +30992,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr ""
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
 msgstr ""
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
 msgstr ""
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr ""
@@ -30927,10 +31028,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3672
+#: build/trans_presets.java:3673
 msgid "Edit Jewelry"
 msgstr ""
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3679
+#: build/trans_presets.java:3680
 msgid "Erotic"
 msgstr ""
@@ -30938,5 +31039,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3681
+#: build/trans_presets.java:3682
 msgid "Edit Erotic"
 msgstr ""
@@ -30944,5 +31045,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -30950,10 +31051,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3691
+#: build/trans_presets.java:3692
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr ""
@@ -30961,5 +31062,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3698
+#: build/trans_presets.java:3699
 msgid "Edit Garden Centre"
 msgstr ""
@@ -30967,5 +31068,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -30973,10 +31074,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3706
+#: build/trans_presets.java:3707
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -30984,10 +31085,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3713
+#: build/trans_presets.java:3714
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3719
 msgid "Paint"
 msgstr ""
@@ -30995,5 +31096,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3720
+#: build/trans_presets.java:3721
 msgid "Edit Paint"
 msgstr ""
@@ -31001,15 +31102,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
 msgstr ""
@@ -31017,10 +31118,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3736
+#: build/trans_presets.java:3737
 msgid "Edit Kitchen"
 msgstr ""
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3743
+#: build/trans_presets.java:3744
 msgid "Curtain"
 msgstr ""
@@ -31028,10 +31129,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3745
+#: build/trans_presets.java:3746
 msgid "Edit Curtain"
 msgstr ""
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3752
+#: build/trans_presets.java:3753
 msgid "Frame"
 msgstr ""
@@ -31039,5 +31140,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3754
+#: build/trans_presets.java:3755
 msgid "Edit Frames"
 msgstr ""
@@ -31045,15 +31146,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
 msgstr ""
@@ -31061,15 +31162,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3770
+#: build/trans_presets.java:3771
 msgid "Edit Copyshop"
 msgstr ""
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3778
 msgid "Book Store"
 msgstr ""
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3779
 msgid "Edit Book Store"
 msgstr ""
@@ -31077,15 +31178,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr ""
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr ""
@@ -31093,20 +31194,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3792
+#: build/trans_presets.java:3793
 msgid "Edit Musical Instruments"
 msgstr ""
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3800
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
 msgstr ""
@@ -31114,10 +31215,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3807
+#: build/trans_presets.java:3808
 msgid "Edit Variety Store"
 msgstr ""
 
 #. item "Vending machine"
-#: build/trans_presets.java:3815
+#: build/trans_presets.java:3816
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -31125,5 +31226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3817
+#: build/trans_presets.java:3818
 msgid "Edit Vending machine"
 msgstr ""
@@ -31131,180 +31232,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "مأكولات"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "مشروبات"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "حلويات"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "سجائر"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr "صور"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "جرائد"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "ألعاب"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "طوابع"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "قسائم"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "bicycle_tube"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "condoms"
 msgstr "مانع الحمل"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "سدادات قطنية"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "excrement_bags"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:3831 build/trans_presets.java:3955
+#: build/trans_presets.java:3832 build/trans_presets.java:3956
 msgid "Geography"
 msgstr ""
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "دولية"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr ""
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:3859
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "الأماكن"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3872
+#: build/trans_presets.java:3873
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -31312,10 +31413,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31323,25 +31424,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr ""
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr ""
@@ -31349,5 +31450,5 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3901
+#: build/trans_presets.java:3902
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -31356,10 +31457,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "بلدة"
@@ -31367,10 +31468,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3910
+#: build/trans_presets.java:3911
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "ضاحية"
@@ -31378,35 +31479,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3919
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "قرية"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3938
+#: build/trans_presets.java:3939
 msgid "Isolated Dwelling"
 msgstr ""
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3939
+#: build/trans_presets.java:3940
 msgid "Edit Isolated Dwelling"
 msgstr ""
@@ -31414,5 +31515,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr "محلة"
@@ -31420,10 +31521,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3948
+#: build/trans_presets.java:3949
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3956
+#: build/trans_presets.java:3957
 msgid "Peak"
 msgstr "قمّة"
@@ -31431,10 +31532,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3958
+#: build/trans_presets.java:3959
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "جليد"
@@ -31442,10 +31543,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3966
+#: build/trans_presets.java:3967
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "بركان"
@@ -31453,10 +31554,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3974
+#: build/trans_presets.java:3975
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -31464,5 +31565,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3982
+#: build/trans_presets.java:3983
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
@@ -31470,5 +31571,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "جزيرة"
@@ -31476,10 +31577,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3990
+#: build/trans_presets.java:3991
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr ""
@@ -31487,15 +31588,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3998
+#: build/trans_presets.java:3999
 msgid "Edit Islet"
 msgstr ""
 
 #. group "Nature"
-#: build/trans_presets.java:4005
+#: build/trans_presets.java:4006
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4007
 msgid "Tree"
 msgstr "شجرة"
@@ -31504,15 +31605,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4010
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "حرج"
@@ -31521,10 +31622,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:4019
+#: build/trans_presets.java:4020
 msgid "Edit Wood"
 msgstr "حرّر حرج"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -31532,5 +31633,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -31538,5 +31639,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -31544,5 +31645,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "غابة"
@@ -31551,30 +31652,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:4027
+#: build/trans_presets.java:4028
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr ""
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "مختلط"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -31582,15 +31683,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr ""
@@ -31598,20 +31699,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:4046
+#: build/trans_presets.java:4047
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr ""
@@ -31619,15 +31720,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4057
+#: build/trans_presets.java:4058
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -31636,40 +31737,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4066
+#: build/trans_presets.java:4067
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31677,15 +31778,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4092
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4098
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -31693,25 +31794,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr ""
@@ -31719,10 +31820,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
 #. item "Land use/Village Green" label "Edit Village Green Landuse"
-#: build/trans_presets.java:4117
+#: build/trans_presets.java:4118
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4123
 msgid "Common"
 msgstr "شائع"
@@ -31730,20 +31831,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:4124
+#: build/trans_presets.java:4125
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4129
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -31751,5 +31852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
 #. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
-#: build/trans_presets.java:4135
+#: build/trans_presets.java:4136
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -31757,15 +31858,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -31773,10 +31874,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:4150
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -31784,40 +31885,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:4157
+#: build/trans_presets.java:4158
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr ""
@@ -31825,10 +31926,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4185
 msgid "Edit Garages"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4190
+#: build/trans_presets.java:4191
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -31836,15 +31937,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4193
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -31852,55 +31953,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr ""
@@ -31908,5 +32009,5 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4237
+#: build/trans_presets.java:4238
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -31917,5 +32018,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4240
+#: build/trans_presets.java:4241
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -31923,5 +32024,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "رقم المنزل"
@@ -31929,5 +32030,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "تسمية المنزل"
@@ -31936,55 +32037,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4245 build/trans_presets.java:4399
+#: build/trans_presets.java:4246 build/trans_presets.java:4401
 msgid "Street name"
 msgstr "إسم الشارع"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "رمز البلد"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "AT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "CH"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "DE"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "FR"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "GB"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "IT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "US"
 msgstr ""
@@ -31992,5 +32093,5 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4251
+#: build/trans_presets.java:4252
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -32002,5 +32103,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4254
+#: build/trans_presets.java:4255
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -32008,35 +32109,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "مفرد"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "مثنى"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr ""
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4259
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4260
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4268
+#: build/trans_presets.java:4269
 msgid "Image"
 msgstr "الصورة"
@@ -32046,5 +32147,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4276
+#: build/trans_presets.java:4277
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -32056,5 +32157,5 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4282 build/trans_presets.java:4299
+#: build/trans_presets.java:4283 build/trans_presets.java:4300
 msgid "outer segment"
 msgstr "الفلق الخارجي"
@@ -32062,5 +32163,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4283 build/trans_presets.java:4300
+#: build/trans_presets.java:4284 build/trans_presets.java:4301
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -32068,5 +32169,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr ""
@@ -32077,5 +32178,5 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4291
+#: build/trans_presets.java:4292
 msgid "Edit Boundary"
 msgstr ""
@@ -32083,46 +32184,51 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "administrative"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "national"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "civil"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "political"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4296
+#: build/trans_presets.java:4297
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:4302
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4303
 msgid "Administration centre"
+msgstr ""
+
+#. item "Relations/Boundary" role "Label point"
+#: build/trans_presets.java:4304
+msgid "Label point"
 msgstr ""
 
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4305
+#: build/trans_presets.java:4307
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -32131,5 +32237,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4308
+#: build/trans_presets.java:4310
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -32137,40 +32243,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -32179,15 +32285,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "via node or ways"
-#: build/trans_presets.java:4316
+#: build/trans_presets.java:4318
 msgid "via node or ways"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4317
+#: build/trans_presets.java:4319
 msgid "to way"
 msgstr "إلى الطريق"
@@ -32195,5 +32301,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "الطريق"
@@ -32207,5 +32313,5 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4328
+#: build/trans_presets.java:4330
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -32215,5 +32321,5 @@
 #. <key key="type" value="route" />
 #. item "Relations/Directional Route (North America)" combo "Route type"
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -32221,5 +32327,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32229,5 +32335,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "road"
 msgstr "الطريق"
@@ -32235,5 +32341,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "ferry"
 msgstr "عبارة بحرية"
@@ -32241,5 +32347,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "ski"
 msgstr ""
@@ -32292,9 +32398,9 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
-#: build/trans_style.java:199 build/trans_style.java:531
-#: build/trans_style.java:537 build/trans_style.java:557
-#: build/trans_style.java:563 build/trans_style.java:582
-#: build/trans_style.java:583 build/trans_style.java:589
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
+#: build/trans_style.java:199 build/trans_style.java:525
+#: build/trans_style.java:531 build/trans_style.java:551
+#: build/trans_style.java:557 build/trans_style.java:576
+#: build/trans_style.java:577 build/trans_style.java:583
 msgid "foot"
 msgstr ""
@@ -32302,5 +32408,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "hiking"
 msgstr ""
@@ -32308,5 +32414,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32316,5 +32422,5 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "detour"
 msgstr ""
@@ -32328,6 +32434,6 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
-#: build/trans_style.java:978
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
+#: build/trans_style.java:993
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32337,5 +32443,5 @@
 #. item "Relations/Route" text "Symbol description"
 #. item "Relations/Directional Route (North America)" text "Symbol description"
-#: build/trans_presets.java:4333 build/trans_presets.java:4363
+#: build/trans_presets.java:4335 build/trans_presets.java:4365
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -32347,6 +32453,6 @@
 #. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4336 build/trans_presets.java:4366
-#: build/trans_presets.java:4388
+#: build/trans_presets.java:4338 build/trans_presets.java:4368
+#: build/trans_presets.java:4390
 msgid "Network"
 msgstr "الشبكة"
@@ -32354,5 +32460,5 @@
 #. item "Relations/Route" combo "Route state"
 #. item "Relations/Directional Route (North America)" combo "Route state"
-#: build/trans_presets.java:4338 build/trans_presets.java:4368
+#: build/trans_presets.java:4340 build/trans_presets.java:4370
 msgid "Route state"
 msgstr ""
@@ -32360,5 +32466,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4338 build/trans_presets.java:4368
+#: build/trans_presets.java:4340 build/trans_presets.java:4370
 msgid "proposed"
 msgstr "المقترح"
@@ -32366,5 +32472,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4338 build/trans_presets.java:4368
+#: build/trans_presets.java:4340 build/trans_presets.java:4370
 msgid "alternate"
 msgstr "البديل"
@@ -32372,5 +32478,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4338 build/trans_presets.java:4368
+#: build/trans_presets.java:4340 build/trans_presets.java:4370
 msgid "temporary"
 msgstr "المؤقت"
@@ -32378,5 +32484,5 @@
 #. item "Relations/Route" combo "Route state" display value
 #. item "Relations/Directional Route (North America)" combo "Route state" display value
-#: build/trans_presets.java:4338 build/trans_presets.java:4368
+#: build/trans_presets.java:4340 build/trans_presets.java:4370
 msgid "connection"
 msgstr "الإتصال"
@@ -32384,5 +32490,5 @@
 #. item "Relations/Route" text "Color (hex)"
 #. item "Relations/Directional Route (North America)" text "Color (hex)"
-#: build/trans_presets.java:4339 build/trans_presets.java:4369
+#: build/trans_presets.java:4341 build/trans_presets.java:4371
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -32394,15 +32500,15 @@
 #. <roles>
 #. item "Relations/Directional Route (North America)" role "route segment"
-#: build/trans_presets.java:4342 build/trans_presets.java:4372
+#: build/trans_presets.java:4344 build/trans_presets.java:4374
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4343
+#: build/trans_presets.java:4345
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4344
+#: build/trans_presets.java:4346
 msgid "backward segment"
 msgstr "الفلق الخلفي"
@@ -32410,5 +32516,5 @@
 #. item "Relations/Route" role "halt point"
 #. item "Relations/Directional Route (North America)" role "halt point"
-#: build/trans_presets.java:4345 build/trans_presets.java:4377
+#: build/trans_presets.java:4347 build/trans_presets.java:4379
 msgid "halt point"
 msgstr "نقطة التوقف"
@@ -32416,5 +32522,5 @@
 #. item "Relations/Route" role "forward halt point"
 #. item "Relations/Directional Route (North America)" role "forward halt point"
-#: build/trans_presets.java:4346 build/trans_presets.java:4378
+#: build/trans_presets.java:4348 build/trans_presets.java:4380
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
@@ -32422,5 +32528,5 @@
 #. item "Relations/Route" role "backward halt point"
 #. item "Relations/Directional Route (North America)" role "backward halt point"
-#: build/trans_presets.java:4347 build/trans_presets.java:4379
+#: build/trans_presets.java:4349 build/trans_presets.java:4381
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -32428,5 +32534,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32440,25 +32546,25 @@
 #. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Directional Route (North America)" label "Edit Directional Route (used in North America)"
-#: build/trans_presets.java:4358
+#: build/trans_presets.java:4360
 msgid "Edit Directional Route (used in North America)"
 msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4375
 msgid "east segment"
 msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4374
+#: build/trans_presets.java:4376
 msgid "north segment"
 msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4377
 msgid "west segment"
 msgstr ""
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:4378
 msgid "south segment"
 msgstr ""
@@ -32466,5 +32572,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -32472,5 +32578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4384
+#: build/trans_presets.java:4386
 msgid "Edit route network"
 msgstr ""
@@ -32479,5 +32585,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr ""
@@ -32485,5 +32591,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr ""
@@ -32491,10 +32597,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4397
+#: build/trans_presets.java:4399
 msgid "Edit associated street"
 msgstr ""
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4402
+#: build/trans_presets.java:4404
 msgid "house"
 msgstr ""
@@ -32689,6 +32795,6 @@
 #: build/trans_style.java:121 build/trans_style.java:146
 #: build/trans_style.java:151 build/trans_style.java:156
-#: build/trans_style.java:483 build/trans_style.java:2324
-#: build/trans_style.java:3443
+#: build/trans_style.java:477 build/trans_style.java:2339
+#: build/trans_style.java:3458
 msgid "deprecated"
 msgstr "مهجور"
@@ -32720,5 +32826,5 @@
 #. <condition k="highway" v="bridleway"/>
 #. color horse
-#: build/trans_style.java:219 build/trans_style.java:519
+#: build/trans_style.java:219 build/trans_style.java:513
 msgid "horse"
 msgstr "خيل"
@@ -32873,10 +32979,7 @@
 #. color barrier
 #: build/trans_style.java:300 build/trans_style.java:309
-#: build/trans_style.java:310 build/trans_style.java:323
-#: build/trans_style.java:324 build/trans_style.java:337
-#: build/trans_style.java:338 build/trans_style.java:343
-#: build/trans_style.java:352 build/trans_style.java:353
-#: build/trans_style.java:362 build/trans_style.java:363
-#: build/trans_style.java:372 build/trans_style.java:373
+#: build/trans_style.java:322 build/trans_style.java:335
+#: build/trans_style.java:340 build/trans_style.java:349
+#: build/trans_style.java:358 build/trans_style.java:367
 msgid "barrier"
 msgstr ""
@@ -32921,5 +33024,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr ""
@@ -32963,7 +33066,7 @@
 #. <condition k="tracktype" v="grade5"/>
 #. color highway_track
-#: build/trans_style.java:495 build/trans_style.java:785
-#: build/trans_style.java:791 build/trans_style.java:797
-#: build/trans_style.java:803 build/trans_style.java:809
+#: build/trans_style.java:489 build/trans_style.java:779
+#: build/trans_style.java:785 build/trans_style.java:791
+#: build/trans_style.java:797 build/trans_style.java:803
 msgid "highway_track"
 msgstr ""
@@ -33037,5 +33140,5 @@
 #. <condition k="highway" v="rest_area"/>
 #. color services
-#: build/trans_style.java:657 build/trans_style.java:663
+#: build/trans_style.java:651 build/trans_style.java:657
 msgid "services"
 msgstr ""
@@ -33047,5 +33150,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr "مخاضة"
@@ -33063,5 +33166,5 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color highway_platform
-#: build/trans_style.java:681 build/trans_style.java:682
+#: build/trans_style.java:675 build/trans_style.java:676
 msgid "highway_platform"
 msgstr ""
@@ -33072,5 +33175,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "مستديرة دوران"
@@ -33083,5 +33186,5 @@
 #. <icon src="service/emergency_access_point.png"/>
 #. color emergency_access_point
-#: build/trans_style.java:705
+#: build/trans_style.java:699
 msgid "emergency_access_point"
 msgstr ""
@@ -33093,5 +33196,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:823 build/trans_style.java:824
+#: build/trans_style.java:817 build/trans_style.java:818
 msgid "riverbank"
 msgstr "شاطئ نهر"
@@ -33103,5 +33206,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "جدول نهر"
@@ -33113,5 +33216,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "حوض سفن"
@@ -33301,17 +33404,17 @@
 #. <icon annotate="true" src="misc/landmark/water_works.png"/>
 #. color manmade
-#: build/trans_style.java:870 build/trans_style.java:891
-#: build/trans_style.java:903 build/trans_style.java:904
-#: build/trans_style.java:910 build/trans_style.java:1328
-#: build/trans_style.java:1334 build/trans_style.java:1339
-#: build/trans_style.java:1345 build/trans_style.java:1352
-#: build/trans_style.java:1358 build/trans_style.java:1364
-#: build/trans_style.java:1370 build/trans_style.java:1376
-#: build/trans_style.java:1382 build/trans_style.java:1406
-#: build/trans_style.java:1412 build/trans_style.java:1418
-#: build/trans_style.java:1424 build/trans_style.java:1429
-#: build/trans_style.java:1436 build/trans_style.java:1442
-#: build/trans_style.java:1448 build/trans_style.java:1454
-#: build/trans_style.java:1460 build/trans_style.java:1466
+#: build/trans_style.java:864 build/trans_style.java:885
+#: build/trans_style.java:897 build/trans_style.java:898
+#: build/trans_style.java:904 build/trans_style.java:1343
+#: build/trans_style.java:1349 build/trans_style.java:1354
+#: build/trans_style.java:1360 build/trans_style.java:1367
+#: build/trans_style.java:1373 build/trans_style.java:1379
+#: build/trans_style.java:1385 build/trans_style.java:1391
+#: build/trans_style.java:1397 build/trans_style.java:1421
+#: build/trans_style.java:1427 build/trans_style.java:1433
+#: build/trans_style.java:1439 build/trans_style.java:1444
+#: build/trans_style.java:1451 build/trans_style.java:1457
+#: build/trans_style.java:1463 build/trans_style.java:1469
+#: build/trans_style.java:1475 build/trans_style.java:1481
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -33323,5 +33426,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr ""
@@ -33369,8 +33472,26 @@
 #. <condition k="railway" v="level_crossing"/>
 #. color railwaypoint
-#: build/trans_style.java:918 build/trans_style.java:929
-#: build/trans_style.java:940 build/trans_style.java:946
-#: build/trans_style.java:952
+#: build/trans_style.java:912 build/trans_style.java:923
+#: build/trans_style.java:934 build/trans_style.java:940
+#: build/trans_style.java:946
 msgid "railwaypoint"
+msgstr ""
+
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. <condition k="service" v="yard"/>
+#. color railyard
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. <condition k="service" v="spur"/>
+#. color railyard
+#: build/trans_style.java:966 build/trans_style.java:973
+msgid "railyard"
 msgstr ""
 
@@ -33388,10 +33509,10 @@
 #. <condition k="railway" v="light_rail"/>
 #. color otherrail
-#: build/trans_style.java:965 build/trans_style.java:972
+#: build/trans_style.java:980 build/trans_style.java:987
 msgid "otherrail"
 msgstr ""
 
 #. color railover
-#: build/trans_style.java:966
+#: build/trans_style.java:981
 msgid "railover"
 msgstr ""
@@ -33419,7 +33540,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:984 build/trans_style.java:992
-#: build/trans_style.java:993 build/trans_style.java:1001
-#: build/trans_style.java:1002
+#: build/trans_style.java:999 build/trans_style.java:1007
+#: build/trans_style.java:1008 build/trans_style.java:1016
+#: build/trans_style.java:1017
 msgid "oldrail"
 msgstr "سكة حديد قديمة"
@@ -33454,6 +33575,6 @@
 #. <condition k="aeroway" v="taxiway"/>
 #. color aeroway
-#: build/trans_style.java:1062 build/trans_style.java:1063
-#: build/trans_style.java:1087
+#: build/trans_style.java:1077 build/trans_style.java:1078
+#: build/trans_style.java:1102
 msgid "aeroway"
 msgstr ""
@@ -33471,5 +33592,5 @@
 #. <condition k="aeroway" v="runway"/>
 #. color aeroway_dark
-#: build/trans_style.java:1075 build/trans_style.java:1081
+#: build/trans_style.java:1090 build/trans_style.java:1096
 msgid "aeroway_dark"
 msgstr ""
@@ -33487,5 +33608,5 @@
 #. <condition k="aeroway" v="hangar"/>
 #. color aeroway_light
-#: build/trans_style.java:1093 build/trans_style.java:1099
+#: build/trans_style.java:1108 build/trans_style.java:1114
 msgid "aeroway_light"
 msgstr ""
@@ -33545,8 +33666,8 @@
 #. <condition k="aerialway" v="goods"/>
 #. color aerialway
-#: build/trans_style.java:1117 build/trans_style.java:1123
-#: build/trans_style.java:1129 build/trans_style.java:1135
-#: build/trans_style.java:1141 build/trans_style.java:1147
-#: build/trans_style.java:1153
+#: build/trans_style.java:1132 build/trans_style.java:1138
+#: build/trans_style.java:1144 build/trans_style.java:1150
+#: build/trans_style.java:1156 build/trans_style.java:1162
+#: build/trans_style.java:1168
 msgid "aerialway"
 msgstr "خط جوي"
@@ -33560,5 +33681,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1161 build/trans_style.java:1162
+#: build/trans_style.java:1176 build/trans_style.java:1177
 msgid "piste_easy"
 msgstr ""
@@ -33570,5 +33691,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1168 build/trans_style.java:1169
+#: build/trans_style.java:1183 build/trans_style.java:1184
 msgid "piste_intermediate"
 msgstr ""
@@ -33580,5 +33701,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1175 build/trans_style.java:1176
+#: build/trans_style.java:1190 build/trans_style.java:1191
 msgid "piste_advanced"
 msgstr ""
@@ -33590,5 +33711,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1182 build/trans_style.java:1183
+#: build/trans_style.java:1197 build/trans_style.java:1198
 msgid "piste_expert"
 msgstr ""
@@ -33600,5 +33721,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1189 build/trans_style.java:1190
+#: build/trans_style.java:1204 build/trans_style.java:1205
 msgid "piste_freeride"
 msgstr ""
@@ -33610,5 +33731,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1196 build/trans_style.java:1197
+#: build/trans_style.java:1211 build/trans_style.java:1212
 msgid "piste_novice"
 msgstr ""
@@ -33737,13 +33858,13 @@
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
 #. color power
-#: build/trans_style.java:1206 build/trans_style.java:1216
-#: build/trans_style.java:1222 build/trans_style.java:1229
-#: build/trans_style.java:1235 build/trans_style.java:1247
-#: build/trans_style.java:1253 build/trans_style.java:1259
-#: build/trans_style.java:1265 build/trans_style.java:1271
-#: build/trans_style.java:1277 build/trans_style.java:1283
-#: build/trans_style.java:1290 build/trans_style.java:1296
-#: build/trans_style.java:1302 build/trans_style.java:1308
-#: build/trans_style.java:1314 build/trans_style.java:1320
+#: build/trans_style.java:1221 build/trans_style.java:1231
+#: build/trans_style.java:1237 build/trans_style.java:1244
+#: build/trans_style.java:1250 build/trans_style.java:1262
+#: build/trans_style.java:1268 build/trans_style.java:1274
+#: build/trans_style.java:1280 build/trans_style.java:1286
+#: build/trans_style.java:1292 build/trans_style.java:1298
+#: build/trans_style.java:1305 build/trans_style.java:1311
+#: build/trans_style.java:1317 build/trans_style.java:1323
+#: build/trans_style.java:1329 build/trans_style.java:1335
 msgid "power"
 msgstr "طاقة"
@@ -33754,5 +33875,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1387 build/trans_style.java:1388
+#: build/trans_style.java:1402 build/trans_style.java:1403
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -33764,5 +33885,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -33878,13 +33999,13 @@
 #. <icon annotate="true" src="leisure/sauna.png"/>
 #. color leisure
-#: build/trans_style.java:1474 build/trans_style.java:1480
-#: build/trans_style.java:1486 build/trans_style.java:1492
-#: build/trans_style.java:1498 build/trans_style.java:1504
-#: build/trans_style.java:1516 build/trans_style.java:1522
-#: build/trans_style.java:1528 build/trans_style.java:1534
-#: build/trans_style.java:1540 build/trans_style.java:1546
-#: build/trans_style.java:1552 build/trans_style.java:1558
-#: build/trans_style.java:1564 build/trans_style.java:1570
-#: build/trans_style.java:1576 build/trans_style.java:1582
+#: build/trans_style.java:1489 build/trans_style.java:1495
+#: build/trans_style.java:1501 build/trans_style.java:1507
+#: build/trans_style.java:1513 build/trans_style.java:1519
+#: build/trans_style.java:1531 build/trans_style.java:1537
+#: build/trans_style.java:1543 build/trans_style.java:1549
+#: build/trans_style.java:1555 build/trans_style.java:1561
+#: build/trans_style.java:1567 build/trans_style.java:1573
+#: build/trans_style.java:1579 build/trans_style.java:1585
+#: build/trans_style.java:1591 build/trans_style.java:1597
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -33896,5 +34017,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "مارينا"
@@ -33968,10 +34089,10 @@
 #. <icon annotate="true" src="food/icecream.png"/>
 #. color amenity
-#: build/trans_style.java:1590 build/trans_style.java:1596
-#: build/trans_style.java:1602 build/trans_style.java:1608
-#: build/trans_style.java:1614 build/trans_style.java:1620
-#: build/trans_style.java:1626 build/trans_style.java:1632
-#: build/trans_style.java:1638 build/trans_style.java:1644
-#: build/trans_style.java:1650
+#: build/trans_style.java:1605 build/trans_style.java:1611
+#: build/trans_style.java:1617 build/trans_style.java:1623
+#: build/trans_style.java:1629 build/trans_style.java:1635
+#: build/trans_style.java:1641 build/trans_style.java:1647
+#: build/trans_style.java:1653 build/trans_style.java:1659
+#: build/trans_style.java:1665
 msgid "amenity"
 msgstr ""
@@ -34055,11 +34176,11 @@
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
 #. color amenity_traffic
-#: build/trans_style.java:1656 build/trans_style.java:1662
-#: build/trans_style.java:1668 build/trans_style.java:1674
-#: build/trans_style.java:1680 build/trans_style.java:1686
-#: build/trans_style.java:1692 build/trans_style.java:1698
-#: build/trans_style.java:1704 build/trans_style.java:1710
-#: build/trans_style.java:1715 build/trans_style.java:1722
-#: build/trans_style.java:1728
+#: build/trans_style.java:1671 build/trans_style.java:1677
+#: build/trans_style.java:1683 build/trans_style.java:1689
+#: build/trans_style.java:1695 build/trans_style.java:1701
+#: build/trans_style.java:1707 build/trans_style.java:1713
+#: build/trans_style.java:1719 build/trans_style.java:1725
+#: build/trans_style.java:1730 build/trans_style.java:1737
+#: build/trans_style.java:1743
 msgid "amenity_traffic"
 msgstr ""
@@ -34395,24 +34516,24 @@
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
 #. color amenity_light
-#: build/trans_style.java:1744 build/trans_style.java:1755
-#: build/trans_style.java:1761 build/trans_style.java:1767
-#: build/trans_style.java:1778 build/trans_style.java:1784
-#: build/trans_style.java:1790 build/trans_style.java:1796
-#: build/trans_style.java:1879 build/trans_style.java:1885
-#: build/trans_style.java:1890 build/trans_style.java:1897
-#: build/trans_style.java:1903 build/trans_style.java:1909
-#: build/trans_style.java:1915 build/trans_style.java:1921
-#: build/trans_style.java:1927 build/trans_style.java:1933
-#: build/trans_style.java:1939 build/trans_style.java:1986
-#: build/trans_style.java:1992 build/trans_style.java:1998
-#: build/trans_style.java:2005 build/trans_style.java:2011
-#: build/trans_style.java:2016 build/trans_style.java:2022
-#: build/trans_style.java:2028 build/trans_style.java:2034
-#: build/trans_style.java:2040 build/trans_style.java:2046
-#: build/trans_style.java:2052 build/trans_style.java:2058
-#: build/trans_style.java:2064 build/trans_style.java:2070
-#: build/trans_style.java:2081 build/trans_style.java:2087
-#: build/trans_style.java:2093 build/trans_style.java:2100
-#: build/trans_style.java:2111
+#: build/trans_style.java:1759 build/trans_style.java:1770
+#: build/trans_style.java:1776 build/trans_style.java:1782
+#: build/trans_style.java:1793 build/trans_style.java:1799
+#: build/trans_style.java:1805 build/trans_style.java:1811
+#: build/trans_style.java:1894 build/trans_style.java:1900
+#: build/trans_style.java:1905 build/trans_style.java:1912
+#: build/trans_style.java:1918 build/trans_style.java:1924
+#: build/trans_style.java:1930 build/trans_style.java:1936
+#: build/trans_style.java:1942 build/trans_style.java:1948
+#: build/trans_style.java:1954 build/trans_style.java:2001
+#: build/trans_style.java:2007 build/trans_style.java:2013
+#: build/trans_style.java:2020 build/trans_style.java:2026
+#: build/trans_style.java:2031 build/trans_style.java:2037
+#: build/trans_style.java:2043 build/trans_style.java:2049
+#: build/trans_style.java:2055 build/trans_style.java:2061
+#: build/trans_style.java:2067 build/trans_style.java:2073
+#: build/trans_style.java:2079 build/trans_style.java:2085
+#: build/trans_style.java:2096 build/trans_style.java:2102
+#: build/trans_style.java:2108 build/trans_style.java:2115
+#: build/trans_style.java:2126
 msgid "amenity_light"
 msgstr ""
@@ -34438,6 +34559,6 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #. color light_water
-#: build/trans_style.java:1802 build/trans_style.java:1808
-#: build/trans_style.java:2869
+#: build/trans_style.java:1817 build/trans_style.java:1823
+#: build/trans_style.java:2884
 msgid "light_water"
 msgstr ""
@@ -34484,8 +34605,8 @@
 #. <condition k="amenity" v="veterinary"/>
 #. color health
-#: build/trans_style.java:1944 build/trans_style.java:1950
-#: build/trans_style.java:1956 build/trans_style.java:1963
-#: build/trans_style.java:1968 build/trans_style.java:1974
-#: build/trans_style.java:1980
+#: build/trans_style.java:1959 build/trans_style.java:1965
+#: build/trans_style.java:1971 build/trans_style.java:1978
+#: build/trans_style.java:1983 build/trans_style.java:1989
+#: build/trans_style.java:1995
 msgid "health"
 msgstr "صحة"
@@ -34854,34 +34975,34 @@
 #. <icon annotate="true" src="shop/mall.png"/>
 #. color shop
-#: build/trans_style.java:2119 build/trans_style.java:2125
-#: build/trans_style.java:2131 build/trans_style.java:2137
-#: build/trans_style.java:2143 build/trans_style.java:2149
-#: build/trans_style.java:2155 build/trans_style.java:2161
-#: build/trans_style.java:2167 build/trans_style.java:2173
-#: build/trans_style.java:2179 build/trans_style.java:2185
-#: build/trans_style.java:2191 build/trans_style.java:2197
-#: build/trans_style.java:2203 build/trans_style.java:2209
-#: build/trans_style.java:2215 build/trans_style.java:2221
-#: build/trans_style.java:2227 build/trans_style.java:2233
-#: build/trans_style.java:2239 build/trans_style.java:2245
-#: build/trans_style.java:2251 build/trans_style.java:2257
-#: build/trans_style.java:2263 build/trans_style.java:2269
-#: build/trans_style.java:2275 build/trans_style.java:2281
-#: build/trans_style.java:2287 build/trans_style.java:2293
-#: build/trans_style.java:2299 build/trans_style.java:2305
-#: build/trans_style.java:2311 build/trans_style.java:2317
-#: build/trans_style.java:2330 build/trans_style.java:2336
-#: build/trans_style.java:2342 build/trans_style.java:2348
-#: build/trans_style.java:2354 build/trans_style.java:2360
-#: build/trans_style.java:2366 build/trans_style.java:2372
-#: build/trans_style.java:2378 build/trans_style.java:2384
-#: build/trans_style.java:2390 build/trans_style.java:2396
-#: build/trans_style.java:2402 build/trans_style.java:2408
-#: build/trans_style.java:2414 build/trans_style.java:2420
-#: build/trans_style.java:2426 build/trans_style.java:2432
-#: build/trans_style.java:2438 build/trans_style.java:2444
-#: build/trans_style.java:2450 build/trans_style.java:2456
-#: build/trans_style.java:2462 build/trans_style.java:2468
-#: build/trans_style.java:2474 build/trans_style.java:2481
+#: build/trans_style.java:2134 build/trans_style.java:2140
+#: build/trans_style.java:2146 build/trans_style.java:2152
+#: build/trans_style.java:2158 build/trans_style.java:2164
+#: build/trans_style.java:2170 build/trans_style.java:2176
+#: build/trans_style.java:2182 build/trans_style.java:2188
+#: build/trans_style.java:2194 build/trans_style.java:2200
+#: build/trans_style.java:2206 build/trans_style.java:2212
+#: build/trans_style.java:2218 build/trans_style.java:2224
+#: build/trans_style.java:2230 build/trans_style.java:2236
+#: build/trans_style.java:2242 build/trans_style.java:2248
+#: build/trans_style.java:2254 build/trans_style.java:2260
+#: build/trans_style.java:2266 build/trans_style.java:2272
+#: build/trans_style.java:2278 build/trans_style.java:2284
+#: build/trans_style.java:2290 build/trans_style.java:2296
+#: build/trans_style.java:2302 build/trans_style.java:2308
+#: build/trans_style.java:2314 build/trans_style.java:2320
+#: build/trans_style.java:2326 build/trans_style.java:2332
+#: build/trans_style.java:2345 build/trans_style.java:2351
+#: build/trans_style.java:2357 build/trans_style.java:2363
+#: build/trans_style.java:2369 build/trans_style.java:2375
+#: build/trans_style.java:2381 build/trans_style.java:2387
+#: build/trans_style.java:2393 build/trans_style.java:2399
+#: build/trans_style.java:2405 build/trans_style.java:2411
+#: build/trans_style.java:2417 build/trans_style.java:2423
+#: build/trans_style.java:2429 build/trans_style.java:2435
+#: build/trans_style.java:2441 build/trans_style.java:2447
+#: build/trans_style.java:2453 build/trans_style.java:2459
+#: build/trans_style.java:2465 build/trans_style.java:2471
+#: build/trans_style.java:2477 build/trans_style.java:2483
+#: build/trans_style.java:2489 build/trans_style.java:2496
 msgid "shop"
 msgstr "متجر/دكان"
@@ -34937,8 +35058,8 @@
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
 #. color hotel
-#: build/trans_style.java:2489 build/trans_style.java:2495
-#: build/trans_style.java:2501 build/trans_style.java:2507
-#: build/trans_style.java:2513 build/trans_style.java:2519
-#: build/trans_style.java:2525 build/trans_style.java:2531
+#: build/trans_style.java:2504 build/trans_style.java:2510
+#: build/trans_style.java:2516 build/trans_style.java:2522
+#: build/trans_style.java:2528 build/trans_style.java:2534
+#: build/trans_style.java:2540 build/trans_style.java:2546
 msgid "hotel"
 msgstr "فندق"
@@ -35014,9 +35135,9 @@
 #. <icon annotate="true" src="misc/information.png"/>
 #. color tourism
-#: build/trans_style.java:2537 build/trans_style.java:2543
-#: build/trans_style.java:2549 build/trans_style.java:2555
-#: build/trans_style.java:2561 build/trans_style.java:2567
-#: build/trans_style.java:2568 build/trans_style.java:2574
-#: build/trans_style.java:2586 build/trans_style.java:2602
+#: build/trans_style.java:2552 build/trans_style.java:2558
+#: build/trans_style.java:2564 build/trans_style.java:2570
+#: build/trans_style.java:2576 build/trans_style.java:2582
+#: build/trans_style.java:2583 build/trans_style.java:2589
+#: build/trans_style.java:2601 build/trans_style.java:2617
 msgid "tourism"
 msgstr "سياحة"
@@ -35084,9 +35205,9 @@
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
 #. color historic
-#: build/trans_style.java:2610 build/trans_style.java:2616
-#: build/trans_style.java:2622 build/trans_style.java:2628
-#: build/trans_style.java:2634 build/trans_style.java:2640
-#: build/trans_style.java:2646 build/trans_style.java:2652
-#: build/trans_style.java:2658 build/trans_style.java:2664
+#: build/trans_style.java:2625 build/trans_style.java:2631
+#: build/trans_style.java:2637 build/trans_style.java:2643
+#: build/trans_style.java:2649 build/trans_style.java:2655
+#: build/trans_style.java:2661 build/trans_style.java:2667
+#: build/trans_style.java:2673 build/trans_style.java:2679
 msgid "historic"
 msgstr "تاريخي"
@@ -35153,9 +35274,9 @@
 #. <condition k="landuse" v="recreation_ground"/>
 #. color green
-#: build/trans_style.java:2671 build/trans_style.java:2677
-#: build/trans_style.java:2683 build/trans_style.java:2689
-#: build/trans_style.java:2695 build/trans_style.java:2730
-#: build/trans_style.java:2736 build/trans_style.java:2742
-#: build/trans_style.java:2822 build/trans_style.java:2828
+#: build/trans_style.java:2686 build/trans_style.java:2692
+#: build/trans_style.java:2698 build/trans_style.java:2704
+#: build/trans_style.java:2710 build/trans_style.java:2745
+#: build/trans_style.java:2751 build/trans_style.java:2757
+#: build/trans_style.java:2837 build/trans_style.java:2843
 msgid "green"
 msgstr "خضار"
@@ -35166,5 +35287,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -35176,5 +35297,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr ""
@@ -35192,5 +35313,5 @@
 #. <condition k="landuse" v="reservoir"/>
 #. color basin
-#: build/trans_style.java:2712 build/trans_style.java:2718
+#: build/trans_style.java:2727 build/trans_style.java:2733
 msgid "basin"
 msgstr "حوض"
@@ -35202,5 +35323,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "غابة"
@@ -35212,5 +35333,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr ""
@@ -35222,5 +35343,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -35239,5 +35360,5 @@
 #. <condition k="landuse" v="commercial"/>
 #. color retail
-#: build/trans_style.java:2767 build/trans_style.java:2773
+#: build/trans_style.java:2782 build/trans_style.java:2788
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -35249,5 +35370,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "صناعي"
@@ -35259,5 +35380,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr ""
@@ -35269,5 +35390,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -35279,5 +35400,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr ""
@@ -35322,7 +35443,7 @@
 #. <icon src="misc/landmark/range.png"/>
 #. color military
-#: build/trans_style.java:2810 build/trans_style.java:2837
-#: build/trans_style.java:2843 build/trans_style.java:2849
-#: build/trans_style.java:2855 build/trans_style.java:2861
+#: build/trans_style.java:2825 build/trans_style.java:2852
+#: build/trans_style.java:2858 build/trans_style.java:2864
+#: build/trans_style.java:2870 build/trans_style.java:2876
 msgid "military"
 msgstr "عسكري"
@@ -35334,5 +35455,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -35343,5 +35464,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "قمّة"
@@ -35354,5 +35475,5 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:2881
+#: build/trans_style.java:2896
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -35364,5 +35485,5 @@
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
 #. color volcano
-#: build/trans_style.java:2887
+#: build/trans_style.java:2902
 msgid "volcano"
 msgstr "بركان"
@@ -35404,8 +35525,8 @@
 #. <icon src="misc/landmark/cave_entrance.png"/>
 #. color natural
-#: build/trans_style.java:2893 build/trans_style.java:2894
-#: build/trans_style.java:2900 build/trans_style.java:2912
-#: build/trans_style.java:2960 build/trans_style.java:2966
-#: build/trans_style.java:2972
+#: build/trans_style.java:2908 build/trans_style.java:2909
+#: build/trans_style.java:2915 build/trans_style.java:2927
+#: build/trans_style.java:2975 build/trans_style.java:2981
+#: build/trans_style.java:2987
 msgid "natural"
 msgstr "طبيعي"
@@ -35417,5 +35538,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -35427,5 +35548,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "أرض بور"
@@ -35437,5 +35558,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr ""
@@ -35447,5 +35568,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "طين"
@@ -35457,5 +35578,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "شاطئ"
@@ -35515,8 +35636,8 @@
 #. <condition k="route" v="pub_crawl"/>
 #. color route
-#: build/trans_style.java:2984 build/trans_style.java:2990
-#: build/trans_style.java:2996 build/trans_style.java:3002
-#: build/trans_style.java:3008 build/trans_style.java:3014
-#: build/trans_style.java:3020 build/trans_style.java:3026
+#: build/trans_style.java:2999 build/trans_style.java:3005
+#: build/trans_style.java:3011 build/trans_style.java:3017
+#: build/trans_style.java:3023 build/trans_style.java:3029
+#: build/trans_style.java:3035 build/trans_style.java:3041
 msgid "route"
 msgstr "طريق"
@@ -35595,12 +35716,12 @@
 #. <condition k="boundary" v="national_park"/>
 #. color boundary
-#: build/trans_style.java:3034 build/trans_style.java:3040
-#: build/trans_style.java:3044 build/trans_style.java:3048
-#: build/trans_style.java:3052 build/trans_style.java:3056
-#: build/trans_style.java:3060 build/trans_style.java:3064
-#: build/trans_style.java:3068 build/trans_style.java:3072
-#: build/trans_style.java:3076 build/trans_style.java:3081
-#: build/trans_style.java:3087 build/trans_style.java:3093
-#: build/trans_style.java:3099
+#: build/trans_style.java:3049 build/trans_style.java:3055
+#: build/trans_style.java:3059 build/trans_style.java:3063
+#: build/trans_style.java:3067 build/trans_style.java:3071
+#: build/trans_style.java:3075 build/trans_style.java:3079
+#: build/trans_style.java:3083 build/trans_style.java:3087
+#: build/trans_style.java:3091 build/trans_style.java:3096
+#: build/trans_style.java:3102 build/trans_style.java:3108
+#: build/trans_style.java:3114
 msgid "boundary"
 msgstr "الحدود"
@@ -35716,11 +35837,11 @@
 #. <icon annotate="true" src="place/islet.png"/>
 #. color place
-#: build/trans_style.java:3481 build/trans_style.java:3487
-#: build/trans_style.java:3493 build/trans_style.java:3499
-#: build/trans_style.java:3505 build/trans_style.java:3511
-#: build/trans_style.java:3517 build/trans_style.java:3523
-#: build/trans_style.java:3529 build/trans_style.java:3535
-#: build/trans_style.java:3541 build/trans_style.java:3547
-#: build/trans_style.java:3553
+#: build/trans_style.java:3496 build/trans_style.java:3502
+#: build/trans_style.java:3508 build/trans_style.java:3514
+#: build/trans_style.java:3520 build/trans_style.java:3526
+#: build/trans_style.java:3532 build/trans_style.java:3538
+#: build/trans_style.java:3544 build/trans_style.java:3550
+#: build/trans_style.java:3556 build/trans_style.java:3562
+#: build/trans_style.java:3568
 msgid "place"
 msgstr "المكان"
@@ -35732,5 +35853,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
 msgstr ""
@@ -35766,6 +35887,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #. color address
-#: build/trans_style.java:3620 build/trans_style.java:3625
-#: build/trans_style.java:3630 build/trans_style.java:3635
+#: build/trans_style.java:3635 build/trans_style.java:3640
+#: build/trans_style.java:3645 build/trans_style.java:3650
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 msgid "address"
@@ -36006,9 +36127,8 @@
 
 #. <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-#. <imagery>
-#. <!--true;Landsat;http://irs.gis-lab.info/?layers=landsat&-->
+#. <imagery xmlns="http://josm.openstreetmap.de/maps-1.0">
 #. <entry>
 #. <name>Landsat</name>
-#: build/trans_wms.java:5
+#: build/trans_wms.java:4
 msgid "Landsat"
 msgstr "Landsat"
@@ -36016,44 +36136,31 @@
 #. <type>wms</type>
 #. <default>true</default>
-#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>NASA:4326</code><code>EPSG:32641</code><code>EPSG:3857</code><code>EPSG:3785</code><code>EPSG:32642</code><code>EPSG:32640</code>
+#. <code>EPSG:4326</code><code>EPSG:900913</code><code>EPSG:3395</code><code>EPSG:32639</code><code>EPSG:32638</code><code>EPSG:32637</code>
+#. <code>EPSG:32636</code><code>EPSG:32635</code>
+#. </projections>
 #. </entry>
-#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
-#. <entry>
-#. <name>Open Aerial Map</name>
-#: build/trans_wms.java:12
-msgid "Open Aerial Map"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
-#. </entry>
+#.
 #. <!--different forms for web access-->
-#. <!--true;Bing Sat;bing:bing-->
+#.
 #. <entry>
 #. <name>Bing Sat</name>
-#: build/trans_wms.java:19
+#: build/trans_wms.java:18
 msgid "Bing Sat"
 msgstr ""
 
 #. <type>bing</type>
+#. <default>true</default>
 #. <!-- url is used as identifier, so put something here -->
 #. <url>http://www.bing.com/maps/</url>
-#. <default>true</default>
 #. </entry>
-#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
-#. <entry>
-#. <name>Yahoo Sat</name>
-#: build/trans_wms.java:27
-msgid "Yahoo Sat"
-msgstr ""
-
-#. <type>html</type>
-#. <url><![CDATA[http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?]]></url>
-#. </entry>
+#.
 #. <!--Tile based access-->
-#. <!--true;MapQuest Open Aerial;tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png-->
+#.
 #. <entry>
 #. <name>MapQuest Open Aerial</name>
-#: build/trans_wms.java:34
+#: build/trans_wms.java:28
 msgid "MapQuest Open Aerial"
 msgstr ""
@@ -36061,11 +36168,10 @@
 #. <type>tms</type>
 #. <default>true</default>
-#. <url><![CDATA[http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png</url>
 #. </entry>
-#. <!--true;OpenStreetMap (Mapnik);tms[18]:http://tile.openstreetmap.org/;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <namUse of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
-#. e>OpenStreetMap (Mapnik)</name>
-#: build/trans_wms.java:42
+#. <name>OpenStreetMap (Mapnik)</name>
+#: build/trans_wms.java:35
 msgid "OpenStreetMap (Mapnik)"
 msgstr ""
@@ -36073,73 +36179,100 @@
 #. <type>tms</type>
 #. <default>true</default>
-#. <url><![CDATA[http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://tile.openstreetmap.org/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--false;OpenCycleMap;tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm-->
+#.
+#. <entry>
+#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
+#: build/trans_wms.java:45
+msgid "OpenStreetMap (Mapnik Black & White)"
+msgstr ""
+
+#. <type>tms</type>
+#. <default>true</default>
+#. <url>http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#.
 #. <entry>
 #. <name>OpenCycleMap</name>
-#: build/trans_wms.java:62
+#: build/trans_wms.java:55
 msgid "OpenCycleMap"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>17</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--false;TilesAtHome;tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <name>TilesAtHome</name>
-#: build/trans_wms.java:71
-msgid "TilesAtHome"
+#. <name>OpenStreetMap (TilesAtHome)</name>
+#: build/trans_wms.java:64
+msgid "OpenStreetMap (TilesAtHome)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>17</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--false;MapQuest OSM;tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm-->
+#.
 #. <entry>
 #. <name>MapQuest OSM</name>
-#: build/trans_wms.java:80
+#: build/trans_wms.java:73
 msgid "MapQuest OSM"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--ODBL map has zoom 1-4, but the tiles are empty-->
-#. <!--false;ODBL coverage;tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm-->
+#.
 #. <entry>
 #. <name>ODBL coverage</name>
-#: build/trans_wms.java:90
+#: build/trans_wms.java:82
 msgid "ODBL coverage"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png]]></url>
-#. <min-zoom>5</min-zoom>
+#. <url>http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png</url>
+#. <min-zoom>5</min-zoom> <!--ODBL map has zoom 1-4, but the tiles are empty-->
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
+#.
+#. <entry>
+#. <name>Public Transport (ÖPNV)</name>
+#: build/trans_wms.java:92
+msgid "Public Transport (ÖPNV)"
+msgstr ""
+
+#. <type>tms</type>
+#. <url>http://tile.memomaps.de/tilegen/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://öpnvkarte.de/</attribution-url>
+#. </entry>
+#.
 #. <!--only for Europe-->
-#. <!--false;ÖPNV;tms[18]:http://tile.xn- ### -pnvkarte-m4a.de/tilegen;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <name>ÖPNV</name>
-#: build/trans_wms.java:101
-msgid "ÖPNV"
+#. <name>OpenStreetMap (German Style)</name>
+#: build/trans_wms.java:103
+msgid "OpenStreetMap (German Style)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://tile.xn--pnvkarte-m4a.de/tilegen/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
@@ -36147,29 +36280,44 @@
 #. <country-code>EU</country-code>
 #. </entry>
-#. <!--false;German Style;tms[18]:http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png;;;osm;osm;osm-->
-#. <entry>
-#. <name>German Style</name>
-#: build/trans_wms.java:111
-msgid "German Style"
-msgstr ""
-
-#. <type>tms</type>
-#. <url><![CDATA[http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png]]></url>
-#. <max-zoom>18</max-zoom>
-#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
-#. <attribution-url>http://openstreetmap.org/</attribution-url>
-#. <country-code>EU</country-code>
-#. </entry>
+#.
 #. <!--only for Germany-->
-#. <!--false;Streets NRW Geofabrik.de;http:/Use of uninitialized value $1 in concatenation (.) or string at convwms.pl line 38.
-#. /tools.geofabrik.de/osmi/view/strassennrw/josmwms?-->
+#.
 #. <entry>
 #. <name>Streets NRW Geofabrik.de</name>
-#: build/trans_wms.java:123
+#: build/trans_wms.java:115
 msgid "Streets NRW Geofabrik.de"
 msgstr "شوارع  NRW Geofabrik.de"
 
+#. <type>wms</type>
+#. <url><![CDATA[http://tools.geofabrik.de/osmi/view/strassennrw/wxs?REQUEST=GetMap&SERVICE=wms&VERSION=1.1.1&FORMAT=image/png&SRS={proj}&STYLES=&LAYERS=unzugeordnete_strassen,kreisstrassen_ast,kreisstrassen,landesstrassen_ast,landesstrassen,bundesstrassen_ast,bundesstrassen,autobahnen_ast,autobahnen,endpunkte&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:4326</code><code>EPSG:900913</code>
+#. </projections>
+#. <bounds min-lat='50.310813' min-lon='5.881575' max-lat='52.538020' max-lon='52.538020'>
+#. <shape>
+#. <point lat='51.826511' lon='5.927293'/><point lat='51.662494' lon='6.012007'/><point lat='51.513156' lon='6.198579'/>
+#. <point lat='51.374450' lon='6.196562'/><point lat='51.238480' lon='6.072517'/><point lat='51.101051' lon='6.038900'/>
+#. <point lat='51.020765' lon='5.881574'/><point lat='50.718666' lon='6.018730'/><point lat='50.499359' lon='6.206983'/>
+#. <point lat='50.378604' lon='6.319935'/><point lat='50.310813' lon='6.399270'/><point lat='50.324551' lon='6.724678'/>
+#. <point lat='50.510477' lon='7.212791'/><point lat='50.545524' lon='7.558370'/><point lat='50.882687' lon='7.801754'/>
+#. <point lat='50.682043' lon='8.057240'/><point lat='50.653919' lon='8.301968'/><point lat='51.164336' lon='8.771256'/>
+#. <point lat='51.348632' lon='8.738984'/><point lat='51.389766' lon='9.021363'/><point lat='51.300736' lon='9.310466'/>
+#. <point lat='51.522988' lon='9.307776'/><point lat='51.641638' lon='9.487961'/><point lat='51.874687' lon='9.478549'/>
+#. <point lat='52.499563' lon='9.154485'/><point lat='52.538020' lon='8.636789'/><point lat='52.473361' lon='7.546268'/>
+#. <point lat='52.336362' lon='7.017815'/><point lat='52.183276' lon='6.877970'/><point lat='51.901245' lon='6.332037'/>
+#. <point lat='51.921153' lon='6.067138'/><point lat='51.826511' lon='5.927293'/>
+#. </shape>
+#. </bounds>
+#. <country-code>DE</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>Hike &amp; Bike</name>
+#: build/trans_wms.java:140
+msgid "Hike & Bike"
+msgstr ""
+
 #. <type>tms</type>
-#. <url><![CDATA[http://toolserver.org/tiles/hikebike/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://toolserver.org/tiles/hikebike/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
@@ -36177,13 +36325,13 @@
 #. <country-code>DE</country-code>
 #. </entry>
-#. <!--false;Sorbische Karte;tms[17]:http://toolserver.org/tiles/osm-locale-hsb;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <name>Sorbische Karte</name>
-#: build/trans_wms.java:140
-msgid "Sorbische Karte"
+#. <name>OpenStreetMap (Sorbian Language)</name>
+#: build/trans_wms.java:150
+msgid "OpenStreetMap (Sorbian Language)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>17</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
@@ -36191,13 +36339,13 @@
 #. <country-code>DE</country-code>
 #. </entry>
-#. <!--false;Deutsche Karte;tms[17]:http://toolserver.org/tiles/osm-locale-de;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <name>Deutsche Karte</name>
-#: build/trans_wms.java:150
-msgid "Deutsche Karte"
+#. <name>OpenStreetMap (German Language)</name>
+#: build/trans_wms.java:160
+msgid "OpenStreetMap (German Language)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>17</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
@@ -36205,13 +36353,13 @@
 #. <country-code>DE</country-code>
 #. </entry>
-#. <!--false;OpenPT Map;tms[5,16]:http://openptmap.de/tiles;;45.7,5.9,55.0,17.3;osm;osm;osm-->
+#.
 #. <entry>
 #. <name>OpenPT Map</name>
-#: build/trans_wms.java:160
+#: build/trans_wms.java:170
 msgid "OpenPT Map"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://openptmap.de/tiles/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://openptmap.de/tiles/{zoom}/{x}/{y}.png</url>
 #. <min-zoom>5</min-zoom>
 #. <max-zoom>16</max-zoom>
@@ -36221,273 +36369,1096 @@
 #. <country-code>DE</country-code>
 #. </entry>
-#. <!--false;Bayern (2m);wms:http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&-->
+#.
+#. <!--only for Bavaria in Germany-->
 #. <entry>
-#. <name>Bayern (2m)</name>
-#: build/trans_wms.java:172
-msgid "Bayern (2m)"
+#. <name>Bavaria (2 m)</name>
+#: build/trans_wms.java:183
+msgid "Bavaria (2 m)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://www.geodaten.bayern.de/ogc/getogc.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=DOP&]]></url>
+#. <url><![CDATA[http://geodaten.bayern.de/ogc/ogc_dop200_oa.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=adv_dop200c&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:31467</code><code>EPSG:31468</code><code>EPSG:25832</code><code>EPSG:25833</code><code>EPSG:4258</code><code>EPSG:4326</code>
+#. </projections>
+#. <bounds min-lat='47.0828' min-lon='8.89292' max-lat='50.6269' max-lon='13.9782'/>
 #. <country-code>DE</country-code>
 #. </entry>
+#.
 #. <!--only for Austria-->
-#. <!--false;Geoimage.at;http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&-->
 #. <entry>
-#. <name>Geoimage.at</name>
-#: build/trans_wms.java:180
-msgid "Geoimage.at"
+#. <name>Geoimage.at MaxRes</name>
+#: build/trans_wms.java:195
+msgid "Geoimage.at MaxRes"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&]]></url>
-#. <country-code>AT</country-code>
-#. </entry>
-#. <!--false;Geoimage.at (HighRes);wms:http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&;;9.35676,46.0872,17.3099,49.2092;geoimage.at;;http://www.geoimage.at/geoimage/geodatendienste-->
-#. <entry>
-#. <name>Geoimage.at (HighRes)</name>
-#: build/trans_wms.java:187
-msgid "Geoimage.at (HighRes)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&]]></url>
-#. <bounds min-lat='9.35676' min-lon='46.0872' max-lat='17.3099' max-lon='49.2092'/>
+#. <url><![CDATA[http://gis.lebensministerium.at/wmsgw/?key=4d80de696cd562a63ce463a58a61488d&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_MR,Luftbild_1m,Luftbild_8m,Satellitenbild_30m&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:3857</code><code>EPSG:900913</code><code>EPSG:31287</code><code>EPSG:3034</code><code>EPSG:3035</code><code>EPSG:3044</code>
+#. <code>EPSG:3045</code><code>EPSG:31254</code><code>EPSG:31255</code><code>EPSG:31256</code><code>EPSG:31257</code><code>EPSG:31258</code>
+#. <code>EPSG:31259</code><code>EPSG:32632</code><code>EPSG:32633</code><code>EPSG:3416</code><code>EPSG:4258</code><code>EPSG:4326</code>
+#. <code>CRS:84</code>
+#. </projections>
+#. <bounds min-lat='46.0872' min-lon='9.35676' max-lat='49.2092' max-lon='17.3099'/>
 #. <attribution-text mandatory='true'>geoimage.at</attribution-text>
 #. <terms-of-use-url>http://www.geoimage.at/geoimage/geodatendienste</terms-of-use-url>
 #. <country-code>AT</country-code>
 #. </entry>
+#.
 #. <!--only for North America-->
+#.
 #. <!--Terraserver USCG - High resolution maps-->
-#. <!--false;MSR Maps Topo;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&-->
 #. <entry>
 #. <name>MSR Maps Topo</name>
-#: build/trans_wms.java:199
+#: build/trans_wms.java:214
 msgid "MSR Maps Topo"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&]]></url>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&srs={proj}&width={width}&height={height}&bbox={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:26904</code><code>EPSG:26905</code><code>EPSG:26906</code><code>EPSG:26907</code><code>EPSG:26908</code><code>EPSG:26909</code>
+#. <code>EPSG:26910</code><code>EPSG:26911</code><code>EPSG:26913</code><code>EPSG:26914</code><code>EPSG:26915</code><code>EPSG:26916</code>
+#. <code>EPSG:26917</code><code>EPSG:26918</code><code>EPSG:26919</code><code>EPSG:26920</code><code>EPSG:4326</code><code>USDA:ALBERS-US</code>
+#. <code>USDA:ALBERS-AK</code>
+#. </projections>
+#. <bounds min-lat="18.543038" min-lon="-168.531789" max-lat="72.270249" max-lon="-64.935273">
+#. <shape>
+#. <point lat="49.675538" lon="-126.228483"/><point lat="47.821745" lon="-126.270570"/><point lat="45.747164" lon="-124.965877"/>
+#. <point lat="42.516198" lon="-126.312656"/><point lat="39.467440" lon="-126.228483"/><point lat="39.499922" lon="-124.334573"/>
+#. <point lat="36.786282" lon="-124.250400"/><point lat="31.430108" lon="-120.107473"/><point lat="30.754354" lon="-113.991725"/>
+#. <point lat="30.187575" lon="-106.758044"/><point lat="28.871597" lon="-106.429240"/><point lat="27.422059" lon="-100.708056"/>
+#. <point lat="25.775721" lon="-100.445013"/><point lat="24.645306" lon="-97.551541"/><point lat="25.675097" lon="-95.825129"/>
+#. <point lat="28.589551" lon="-93.342744"/><point lat="28.876757" lon="-84.223429"/><point lat="23.749040" lon="-84.206190"/>
+#. <point lat="23.659451" lon="-79.610438"/><point lat="31.592127" lon="-78.011137"/><point lat="35.106755" lon="-73.297408"/>
+#. <point lat="39.812295" lon="-71.379825"/><point lat="43.923562" lon="-65.264076"/><point lat="48.558675" lon="-64.935272"/>
+#. <point lat="48.732471" lon="-70.524935"/><point lat="45.787987" lon="-74.996665"/><point lat="45.512172" lon="-81.243935"/>
+#. <point lat="47.636405" lon="-81.375456"/><point lat="49.592482" lon="-89.727070"/><point lat="50.771480" lon="-94.198800"/>
+#. <point lat="50.688230" lon="-96.566186"/><point lat="49.592482" lon="-96.566186"/><point lat="49.675538" lon="-126.228483"/>
+#. </shape>
+#. <shape>
+#. <point lat="22.799823" lon="-160.876761"/><point lat="21.169400" lon="-160.842284"/><point lat="20.557282" lon="-159.049450"/>
+#. <point lat="20.589561" lon="-156.498111"/><point lat="18.543038" lon="-156.360200"/><point lat="18.592063" lon="-154.498412"/>
+#. <point lat="20.541140" lon="-154.532889"/><point lat="22.863376" lon="-156.739453"/><point lat="22.799823" lon="-160.876761"/>
+#. </shape>
+#. <shape>
+#. <point lat="69.460718" lon="-168.285186"/><point lat="58.817757" lon="-168.531789"/><point lat="58.689840" lon="-163.106528"/>
+#. <point lat="55.845869" lon="-160.802929"/><point lat="55.893097" lon="-151.459644"/><point lat="58.993680" lon="-151.122949"/>
+#. <point lat="58.993680" lon="-138.665235"/><point lat="53.435534" lon="-134.288201"/><point lat="53.560710" lon="-129.574471"/>
+#. <point lat="57.510190" lon="-129.406124"/><point lat="60.519628" lon="-131.720902"/><point lat="62.036189" lon="-140.559144"/>
+#. <point lat="71.241133" lon="-140.356601"/><point lat="71.283383" lon="-149.826147"/><point lat="72.270249" lon="-149.694626"/>
+#. <point lat="72.270249" lon="-152.193534"/><point lat="71.219974" lon="-152.193534"/><point lat="71.325541" lon="-162.254926"/>
+#. <point lat="69.460718" lon="-168.285186"/>
+#. </shape>
+#. <shape>
+#. <point lat="54.535518" lon="-168.300048"/><point lat="52.800357" lon="-168.199039"/><point lat="52.800357" lon="-165.572818"/>
+#. <point lat="53.626982" lon="-163.687327"/><point lat="53.626982" lon="-160.556063"/><point lat="55.424272" lon="-160.926428"/>
+#. <point lat="55.405160" lon="-166.111530"/><point lat="54.535518" lon="-168.300048"/>
+#. </shape>
+#. </bounds>
 #. <country-code>US</country-code>
 #. </entry>
-#. <!--false;MSR Maps Urban;http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&-->
 #. <entry>
 #. <name>MSR Maps Urban</name>
-#: build/trans_wms.java:206
+#: build/trans_wms.java:260
 msgid "MSR Maps Urban"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&]]></url>
+#. <url><![CDATA[http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&srs={proj}&width={width}&height={height}&bbox={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:26904</code><code>EPSG:26905</code><code>EPSG:26906</code><code>EPSG:26907</code><code>EPSG:26908</code><code>EPSG:26909</code>
+#. <code>EPSG:26910</code><code>EPSG:26911</code><code>EPSG:26913</code><code>EPSG:26914</code><code>EPSG:26915</code><code>EPSG:26916</code>
+#. <code>EPSG:26917</code><code>EPSG:26918</code><code>EPSG:26919</code><code>EPSG:26920</code><code>EPSG:4326</code><code>USDA:ALBERS-US</code>
+#. <code>USDA:ALBERS-AK</code>
+#. </projections>
+#. <bounds min-lat='27.469957' min-lon='-123.143332' max-lat='45.763165' max-lon='45.763165'>
+#. <shape>
+#. <point lat='34.134516' lon='-117.495307'/><point lat='33.993269' lon='-117.493214'/><point lat='33.990815' lon='-117.734379'/>
+#. <point lat='33.775355' lon='-117.733141'/><point lat='33.769460' lon='-117.973749'/><point lat='33.611462' lon='-117.970109'/>
+#. <point lat='33.611224' lon='-117.993405'/><point lat='33.682231' lon='-118.090104'/><point lat='33.693331' lon='-118.350113'/>
+#. <point lat='33.732706' lon='-118.432957'/><point lat='33.746072' lon='-118.447625'/><point lat='33.803295' lon='-118.448470'/>
+#. <point lat='33.803640' lon='-118.414551'/><point lat='33.867609' lon='-118.415496'/><point lat='33.867423' lon='-118.433746'/>
+#. <point lat='33.989674' lon='-118.516370'/><point lat='34.042538' lon='-118.517152'/><point lat='34.259805' lon='-118.504981'/>
+#. <point lat='34.261323' lon='-118.355253'/><point lat='34.247607' lon='-118.355049'/><point lat='34.247764' lon='-118.339622'/>
+#. <point lat='34.260724' lon='-118.339815'/><point lat='34.262692' lon='-118.145763'/><point lat='34.247151' lon='-118.145532'/>
+#. <point lat='34.247485' lon='-118.112604'/><point lat='34.126978' lon='-118.110816'/><point lat='34.128328' lon='-117.977908'/>
+#. <point lat='33.891347' lon='-117.974400'/><point lat='33.892759' lon='-117.835778'/><point lat='34.007108' lon='-117.837470'/>
+#. <point lat='34.008494' lon='-117.701250'/><point lat='34.132406' lon='-117.703086'/><point lat='34.134516' lon='-117.495307'/>
+#. </shape>
+#. <shape>
+#. <point lat='35.762527' lon='-97.774677'/><point lat='35.236017' lon='-97.748414'/><point lat='35.238698' lon='-97.229720'/>
+#. <point lat='35.757199' lon='-97.236286'/><point lat='35.762527' lon='-97.774677'/>
+#. </shape>
+#. <shape>
+#. <point lat='32.629460' lon='-93.887723'/><point lat='32.234618' lon='-93.879516'/><point lat='32.234618' lon='-93.493779'/>
+#. <point lat='32.629460' lon='-93.481468'/><point lat='32.629460' lon='-93.887723'/>
+#. </shape>
+#. <shape>
+#. <point lat='39.138277' lon='-105.036227'/><point lat='39.136818' lon='-104.606672'/><point lat='38.979979' lon='-104.607557'/>
+#. <point lat='38.979782' lon='-104.549648'/><point lat='38.889301' lon='-104.550157'/><point lat='38.889505' lon='-104.609967'/>
+#. <point lat='38.716711' lon='-104.610938'/><point lat='38.717343' lon='-104.795884'/><point lat='38.675462' lon='-104.796119'/>
+#. <point lat='38.675715' lon='-104.870116'/><point lat='38.730901' lon='-104.869806'/><point lat='38.731478' lon='-105.038517'/>
+#. <point lat='39.138277' lon='-105.036227'/>
+#. </shape>
+#. <shape>
+#. <point lat='40.268988' lon='-105.638865'/><point lat='40.269254' lon='-104.907046'/><point lat='40.079773' lon='-104.908360'/>
+#. <point lat='40.077992' lon='-104.468759'/><point lat='39.825713' lon='-104.470502'/><point lat='39.824716' lon='-104.225520'/>
+#. <point lat='39.711669' lon='-104.226299'/><point lat='39.712680' lon='-104.474286'/><point lat='39.541171' lon='-104.475465'/>
+#. <point lat='39.541689' lon='-104.602206'/><point lat='39.295189' lon='-104.603896'/><point lat='39.295915' lon='-104.781222'/>
+#. <point lat='39.176377' lon='-104.782039'/><point lat='39.177115' lon='-104.961929'/><point lat='39.364274' lon='-104.960648'/>
+#. <point lat='39.364952' lon='-105.126193'/><point lat='39.151496' lon='-105.258571'/><point lat='39.149867' lon='-105.439261'/>
+#. <point lat='39.483090' lon='-105.439261'/><point lat='39.487955' lon='-105.512797'/><point lat='40.001675' lon='-105.516999'/>
+#. <point lat='39.998456' lon='-105.638859'/><point lat='40.268988' lon='-105.638865'/>
+#. </shape>
+#. <shape>
+#. <point lat='40.999349' lon='-96.883764'/><point lat='40.601736' lon='-96.870633'/><point lat='40.616690' lon='-96.463557'/>
+#. <point lat='41.004305' lon='-96.479971'/><point lat='40.999349' lon='-96.883764'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.119228' lon='-84.633233'/><point lat='37.850779' lon='-84.629129'/><point lat='37.854019' lon='-84.337774'/>
+#. <point lat='38.148277' lon='-84.362396'/><point lat='38.119228' lon='-84.633233'/>
+#. </shape>
+#. <shape>
+#. <point lat='30.752870' lon='-91.248561'/><point lat='30.240877' lon='-91.248561'/><point lat='30.246549' lon='-90.864465'/>
+#. <point lat='30.764154' lon='-90.851334'/><point lat='30.752870' lon='-91.248561'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.133335' lon='-121.984340'/><point lat='38.131960' lon='-121.853236'/><point lat='38.036704' lon='-121.854850'/>
+#. <point lat='38.038081' lon='-121.985953'/><point lat='38.133335' lon='-121.984340'/>
+#. </shape>
+#. <shape>
+#. <point lat='36.133888' lon='-84.134940'/><point lat='36.133888' lon='-84.000473'/><point lat='35.746046' lon='-83.998372'/>
+#. <point lat='35.739225' lon='-84.258901'/><point lat='35.739225' lon='-84.258901'/><point lat='36.009918' lon='-84.258901'/>
+#. <point lat='36.015016' lon='-84.139142'/><point lat='36.133888' lon='-84.134940'/>
+#. </shape>
+#. <shape>
+#. <point lat='42.484741' lon='-88.531924'/><point lat='41.219166' lon='-88.493453'/><point lat='41.238455' lon='-87.095669'/>
+#. <point lat='41.661372' lon='-87.082845'/><point lat='41.647000' lon='-87.390614'/><point lat='42.342726' lon='-87.794561'/>
+#. <point lat='42.767805' lon='-87.749678'/><point lat='42.748974' lon='-87.916386'/><point lat='42.635869' lon='-87.890739'/>
+#. <point lat='42.631151' lon='-88.378040'/><point lat='42.484741' lon='-88.531924'/>
+#. </shape>
+#. <shape>
+#. <point lat='35.526648' lon='-81.006949'/><point lat='35.147438' lon='-81.075233'/><point lat='35.029242' lon='-81.064727'/>
+#. <point lat='34.981916' lon='-81.001696'/><point lat='34.981916' lon='-80.597247'/><point lat='35.128108' lon='-80.594621'/>
+#. <point lat='35.205398' lon='-80.513205'/><point lat='35.276183' lon='-80.605126'/><point lat='35.530922' lon='-80.607752'/>
+#. <point lat='35.526648' lon='-81.006949'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.883399' lon='-81.628131'/><point lat='28.880807' lon='-81.107079'/><point lat='28.364408' lon='-81.110421'/>
+#. <point lat='28.367013' lon='-81.631473'/><point lat='28.883399' lon='-81.628131'/>
+#. </shape>
+#. <shape>
+#. <point lat='30.062839' lon='-90.353663'/><point lat='29.898382' lon='-90.351084'/><point lat='29.898843' lon='-90.311994'/>
+#. <point lat='29.805215' lon='-90.310528'/><point lat='29.806516' lon='-90.200175'/><point lat='29.744985' lon='-90.199212'/>
+#. <point lat='29.747370' lon='-89.996920'/><point lat='30.066974' lon='-90.001928'/><point lat='30.062839' lon='-90.353663'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.129590' lon='-121.520236'/><point lat='38.126636' lon='-121.345919'/><point lat='38.141070' lon='-121.345524'/>
+#. <point lat='38.137257' lon='-121.120504'/><point lat='38.068244' lon='-121.122394'/><point lat='38.067913' lon='-121.102872'/>
+#. <point lat='37.891054' lon='-121.107706'/><point lat='37.884682' lon='-120.732933'/><point lat='37.478381' lon='-120.743993'/>
+#. <point lat='37.485189' lon='-121.142215'/><point lat='37.862602' lon='-121.131943'/><point lat='37.869007' lon='-121.508537'/>
+#. <point lat='38.095402' lon='-121.502349'/><point lat='38.095721' lon='-121.521163'/><point lat='38.129590' lon='-121.520236'/>
+#. </shape>
+#. <shape>
+#. <point lat='45.763165' lon='-123.137309'/><point lat='45.241176' lon='-123.143332'/><point lat='45.236748' lon='-122.365670'/>
+#. <point lat='45.758778' lon='-122.359648'/><point lat='45.763165' lon='-123.137309'/>
+#. </shape>
+#. <shape>
+#. <point lat='32.505753' lon='-86.498714'/><point lat='32.235455' lon='-86.494680'/><point lat='32.241142' lon='-86.118175'/>
+#. <point lat='32.510289' lon='-86.122209'/><point lat='32.505753' lon='-86.498714'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.251952' lon='-82.865214'/><point lat='27.803133' lon='-82.865214'/><point lat='27.469957' lon='-82.737051'/>
+#. <point lat='27.484869' lon='-82.100437'/><point lat='28.272308' lon='-82.113043'/><point lat='28.251952' lon='-82.865214'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.871043' lon='-90.768518'/><point lat='38.370091' lon='-90.723635'/><point lat='38.365064' lon='-90.101685'/>
+#. <point lat='38.900989' lon='-90.108097'/><point lat='38.871043' lon='-90.768518'/>
+#. </shape>
+#. <shape>
+#. <point lat='33.760839' lon='-102.001398'/><point lat='33.370435' lon='-102.003499'/><point lat='33.373944' lon='-101.742971'/>
+#. <point lat='33.767825' lon='-101.742971'/><point lat='33.760839' lon='-102.001398'/>
+#. </shape>
+#. <shape>
+#. <point lat='34.877835' lon='-86.876700'/><point lat='34.614123' lon='-86.875376'/><point lat='34.614525' lon='-86.756857'/>
+#. <point lat='34.495985' lon='-86.756263'/><point lat='34.496874' lon='-86.494935'/><point lat='34.615196' lon='-86.495527'/>
+#. <point lat='34.615587' lon='-86.380337'/><point lat='34.879511' lon='-86.381663'/><point lat='34.877835' lon='-86.876700'/>
+#. </shape>
+#. <shape>
+#. <point lat='35.261818' lon='-106.888601'/><point lat='35.264450' lon='-106.371753'/><point lat='34.860303' lon='-106.368674'/>
+#. <point lat='34.857658' lon='-106.885522'/><point lat='35.261818' lon='-106.888601'/>
+#. </shape>
+#. <shape>
+#. <point lat='41.248097' lon='-85.383704'/><point lat='40.851594' lon='-85.370880'/><point lat='40.856444' lon='-84.857932'/>
+#. <point lat='41.257738' lon='-84.845108'/><point lat='41.248097' lon='-85.383704'/>
+#. </shape>
+#. <shape>
+#. <point lat='39.222727' lon='-96.006365'/><point lat='39.217914' lon='-95.593677'/><point lat='39.074762' lon='-95.596456'/>
+#. <point lat='39.073475' lon='-95.486297'/><point lat='38.863907' lon='-95.490355'/><point lat='38.869346' lon='-95.954388'/>
+#. <point lat='39.102283' lon='-95.949876'/><point lat='39.102970' lon='-96.008690'/><point lat='39.222727' lon='-96.006365'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.896066' lon='-95.913235'/><point lat='29.468938' lon='-95.902730'/><point lat='29.457962' lon='-95.387976'/>
+#. <point lat='29.414046' lon='-95.186277'/><point lat='29.417707' lon='-95.032901'/><point lat='29.468938' lon='-94.948860'/>
+#. <point lat='29.651693' lon='-94.946759'/><point lat='29.660822' lon='-94.858515'/><point lat='29.899709' lon='-94.864818'/>
+#. <point lat='29.899709' lon='-94.978274'/><point lat='30.154377' lon='-94.978274'/><point lat='30.154377' lon='-95.104336'/>
+#. <point lat='30.276021' lon='-95.119044'/><point lat='30.268763' lon='-95.278722'/><point lat='30.150743' lon='-95.270318'/>
+#. <point lat='30.145293' lon='-95.661111'/><point lat='30.019848' lon='-95.652707'/><point lat='30.019848' lon='-95.776668'/>
+#. <point lat='29.896066' lon='-95.776668'/><point lat='29.896066' lon='-95.913235'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.758011' lon='-121.118955'/><point lat='38.999685' lon='-121.117827'/><point lat='39.000092' lon='-121.262040'/>
+#. <point lat='38.884962' lon='-121.262577'/><point lat='38.886032' lon='-121.641237'/><point lat='38.751901' lon='-121.641862'/>
+#. <point lat='38.752247' lon='-121.764150'/><point lat='38.616150' lon='-121.764783'/><point lat='38.615765' lon='-121.629410'/>
+#. <point lat='38.366976' lon='-121.630565'/><point lat='38.366639' lon='-121.512057'/><point lat='38.246864' lon='-121.512612'/>
+#. <point lat='38.246079' lon='-121.237387'/><point lat='38.370295' lon='-121.236812'/><point lat='38.369924' lon='-121.106373'/>
+#. <point lat='38.623513' lon='-121.105196'/><point lat='38.623167' lon='-120.983188'/><point lat='38.757625' lon='-120.982562'/>
+#. <point lat='38.758011' lon='-121.118955'/>
+#. </shape>
+#. <shape>
+#. <point lat='32.006000' lon='-106.627817'/><point lat='32.002351' lon='-106.240554'/><point lat='31.625004' lon='-106.240554'/>
+#. <point lat='31.622072' lon='-106.333497'/><point lat='31.744371' lon='-106.417834'/><point lat='31.744371' lon='-106.515941'/>
+#. <point lat='31.781688' lon='-106.552946'/><point lat='31.791197' lon='-106.634702'/><point lat='32.006000' lon='-106.627817'/>
+#. </shape>
+#. <shape>
+#. <point lat='32.507345' lon='-110.618397'/><point lat='31.997195' lon='-110.618397'/><point lat='31.997195' lon='-111.131345'/>
+#. <point lat='32.507345' lon='-111.131345'/><point lat='32.507345' lon='-110.618397'/>
+#. </shape>
+#. <shape>
+#. <point lat='42.742721' lon='-83.656451'/><point lat='42.091389' lon='-83.620544'/><point lat='42.106613' lon='-83.071690'/>
+#. <point lat='42.307987' lon='-83.071690'/><point lat='42.315573' lon='-82.938323'/><point lat='42.387599' lon='-82.845992'/>
+#. <point lat='42.504937' lon='-82.702367'/><point lat='42.535182' lon='-82.599777'/><point lat='42.769085' lon='-82.615166'/>
+#. <point lat='42.742721' lon='-83.656451'/>
+#. </shape>
+#. <shape>
+#. <point lat='32.500931' lon='-90.390196'/><point lat='32.116926' lon='-90.379690'/><point lat='32.116926' lon='-89.996251'/>
+#. <point lat='32.512005' lon='-90.004130'/><point lat='32.500931' lon='-90.390196'/>
+#. </shape>
+#. <shape>
+#. <point lat='39.153405' lon='-77.500727'/><point lat='39.124760' lon='-76.729253'/><point lat='38.600741' lon='-76.729253'/>
+#. <point lat='38.600741' lon='-77.381723'/><point lat='38.876013' lon='-77.652560'/><point lat='39.003685' lon='-77.652560'/>
+#. <point lat='39.153405' lon='-77.500727'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.507602' lon='-86.009481'/><point lat='37.988771' lon='-86.014618'/><point lat='37.984734' lon='-85.355969'/>
+#. <point lat='38.503594' lon='-85.350831'/><point lat='38.507602' lon='-86.009481'/>
+#. </shape>
+#. <shape>
+#. <point lat='41.609469' lon='-71.223491'/><point lat='41.613239' lon='-71.636975'/><point lat='42.014117' lon='-71.628571'/>
+#. <point lat='41.994133' lon='-71.221810'/><point lat='41.609469' lon='-71.223491'/>
+#. </shape>
+#. <shape>
+#. <point lat='36.621496' lon='-119.606120'/><point lat='36.615376' lon='-119.996879'/><point lat='37.008744' lon='-120.006466'/>
+#. <point lat='37.014833' lon='-119.615708'/><point lat='36.621496' lon='-119.606120'/>
+#. </shape>
+#. <shape>
+#. <point lat='37.921487' lon='-121.857805'/><point lat='37.236217' lon='-121.871096'/><point lat='37.237895' lon='-122.008203'/>
+#. <point lat='37.358519' lon='-122.005873'/><point lat='37.361612' lon='-122.259083'/><point lat='37.479588' lon='-122.258621'/>
+#. <point lat='37.481289' lon='-122.359457'/><point lat='37.483398' lon='-122.532319'/><point lat='37.509440' lon='-122.531814'/>
+#. <point lat='37.509659' lon='-122.549766'/><point lat='37.527810' lon='-122.549414'/><point lat='37.527577' lon='-122.530334'/>
+#. <point lat='37.623690' lon='-122.528470'/><point lat='37.725362' lon='-122.528988'/><point lat='37.791222' lon='-122.544823'/>
+#. <point lat='37.833019' lon='-122.600973'/><point lat='37.902822' lon='-122.633035'/><point lat='37.930880' lon='-122.632488'/>
+#. <point lat='37.921487' lon='-121.857805'/>
+#. </shape>
+#. <shape>
+#. <point lat='40.357294' lon='-112.139116'/><point lat='40.359910' lon='-111.742940'/><point lat='40.538255' lon='-111.744970'/>
+#. <point lat='40.538379' lon='-111.726123'/><point lat='41.010358' lon='-111.731524'/><point lat='41.009494' lon='-111.863695'/>
+#. <point lat='41.376312' lon='-111.867919'/><point lat='41.374552' lon='-112.138658'/><point lat='40.986048' lon='-112.134185'/>
+#. <point lat='40.986865' lon='-112.009328'/><point lat='40.873816' lon='-112.008031'/><point lat='40.873028' lon='-112.128268'/>
+#. <point lat='40.737200' lon='-112.126713'/><point lat='40.737090' lon='-112.143447'/><point lat='40.357294' lon='-112.139116'/>
+#. </shape>
+#. <shape>
+#. <point lat='36.129355' lon='-79.140467'/><point lat='35.862475' lon='-79.135392'/><point lat='35.864025' lon='-79.011072'/>
+#. <point lat='35.729521' lon='-79.008521'/><point lat='35.731067' lon='-78.884767'/><point lat='35.610028' lon='-78.882475'/>
+#. <point lat='35.615117' lon='-78.475600'/><point lat='36.005180' lon='-78.483000'/><point lat='36.001974' lon='-78.740543'/>
+#. <point lat='36.134293' lon='-78.743061'/><point lat='36.129355' lon='-79.140467'/>
+#. </shape>
+#. <shape>
+#. <point lat='34.141791' lon='-84.769760'/><point lat='33.368826' lon='-84.767133'/><point lat='33.366632' lon='-84.000255'/>
+#. <point lat='34.143965' lon='-84.000255'/><point lat='34.141791' lon='-84.769760'/>
+#. </shape>
+#. <shape>
+#. <point lat='42.014117' lon='-72.912724'/><point lat='41.924138' lon='-72.848853'/><point lat='41.989135' lon='-72.349647'/>
+#. <point lat='42.005374' lon='-71.988268'/><point lat='42.426133' lon='-71.993311'/><point lat='42.426133' lon='-72.052140'/>
+#. <point lat='42.167536' lon='-72.053821'/><point lat='42.168782' lon='-72.193330'/><point lat='42.272098' lon='-72.198372'/>
+#. <point lat='42.275829' lon='-72.435369'/><point lat='42.418999' lon='-72.455539'/><point lat='42.413725' lon='-72.768173'/>
+#. <point lat='42.257171' lon='-72.911044'/><point lat='42.014117' lon='-72.912724'/>
+#. </shape>
+#. <shape>
+#. <point lat='30.878714' lon='-88.389587'/><point lat='30.484082' lon='-88.381183'/><point lat='30.495670' lon='-87.986188'/>
+#. <point lat='30.888812' lon='-87.994593'/><point lat='30.878714' lon='-88.389587'/>
+#. </shape>
+#. <shape>
+#. <point lat='32.835214' lon='-97.613192'/><point lat='32.402470' lon='-97.618453'/><point lat='32.394438' lon='-96.689414'/>
+#. <point lat='32.827221' lon='-96.684154'/><point lat='32.835214' lon='-97.613192'/>
+#. </shape>
+#. <shape>
+#. <point lat='35.386428' lon='-102.003052'/><point lat='34.986659' lon='-102.003052'/><point lat='34.997417' lon='-101.605825'/>
+#. <point lat='35.402485' lon='-101.602542'/><point lat='35.386428' lon='-102.003052'/>
+#. </shape>
+#. </bounds>
 #. <country-code>US</country-code>
 #. </entry>
+#.
 #. <!--only for Czech Republic-->
-#. <!--false;Czech CUZK:KM;http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&-->
+#.
 #. <entry>
 #. <name>Czech CUZK:KM</name>
-#: build/trans_wms.java:214
+#: build/trans_wms.java:501
 msgid "Czech CUZK:KM"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&]]></url>
+#. <url><![CDATA[http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:102067</code><code>EPSG:32633</code><code>EPSG:32634</code><code>EPSG:28403</code><code>EPSG:28404</code><code>EPSG:5221</code>
+#. <code>EPSG:5224</code><code>EPSG:5225</code><code>EPSG:4326</code><code>EPSG:4258</code><code>EPSG:3035</code><code>EPSG:2065</code>
+#. </projections>
 #. <country-code>CZ</country-code>
 #. </entry>
-#. <!--false;Czech UHUL:ORTOFOTO;http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&-->
+#.
 #. <entry>
 #. <name>Czech UHUL:ORTOFOTO</name>
-#: build/trans_wms.java:221
+#: build/trans_wms.java:512
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&]]></url>
+#. <url><![CDATA[http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:2065</code><code>EPSG:4326</code><code>EPSG:28403</code><code>EPSG:28404</code><code>EPSG:32633</code><code>EPSG:32634</code><code>EPSG:102067</code>
+#. </projections>
 #. <country-code>CZ</country-code>
 #. </entry>
+#.
 #. <!--only for GB-->
-#. <!--false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&-->
+#.
 #. <entry>
-#. <name>NPE Maps</name>
-#: build/trans_wms.java:229
-msgid "NPE Maps"
-msgstr "خرائط NPE"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>GB</country-code>
 #. </entry>
-#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
-#. <entry>
-#. <name>NPE Maps (Tim)</name>
-#: build/trans_wms.java:236
-msgid "NPE Maps (Tim)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://timsc.dev.openstreetmap.org/wms2/map.php?]]></url>
-#. <country-code>GB</country-code>
-#. </entry>
-#. <!--false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&-->
-#. <entry>
-#. <name>7th Series (OS7)</name>
-#: build/trans_wms.java:243
-msgid "7th Series (OS7)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
-#. <country-code>GB</country-code>
-#. </entry>
-#. <!--only for Japan-->
-#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO)</name>
-#: build/trans_wms.java:251
-msgid "MLIT Japan (ORTHO)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO01)</name>
-#: build/trans_wms.java:258
-msgid "MLIT Japan (ORTHO01)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO02)</name>
-#: build/trans_wms.java:265
-msgid "MLIT Japan (ORTHO02)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO03)</name>
-#: build/trans_wms.java:272
-msgid "MLIT Japan (ORTHO03)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
+#.
 #. <!--only for Italy-->
-#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#.
 #. <entry>
 #. <name>Lodi - Italy</name>
-#: build/trans_wms.java:280
+#: build/trans_wms.java:533
 msgid "Lodi - Italy"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&]]></url>
+#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:32632</code><code>EPSG:4326</code>
+#. </projections>
 #. <country-code>IT</country-code>
 #. </entry>
-#. <!--false;Sicily - Italy;http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&-->
+#.
 #. <entry>
 #. <name>Sicily - Italy</name>
-#: build/trans_wms.java:287
+#: build/trans_wms.java:543
 msgid "Sicily - Italy"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&LAYERS=0&STYLES=default&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>CRS:84</code><code>EPSG:4326</code><code>EPSG:32633</code>
+#. </projections>
 #. <country-code>IT</country-code>
 #. </entry>
-#. <!--false;PCN 2006 - Italy;http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&-->
+#.
 #. <entry>
 #. <name>PCN 2006 - Italy</name>
-#: build/trans_wms.java:294
+#: build/trans_wms.java:553
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&]]></url>
+#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:4326</code>
+#. </projections>
 #. <country-code>IT</country-code>
 #. </entry>
+#.
 #. <!--only for France-->
-#. <!--false;SPOTMaps (France);http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html-->
+#.
 #. <entry>
-#. <name>SPOTMaps (France)</name>
-#: build/trans_wms.java:302
-msgid "SPOTMaps (France)"
+#. <name>CRAIG - Auvergne 30 cm</name>
+#: build/trans_wms.java:565
+msgid "CRAIG - Auvergne 30 cm"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&]]></url>
-#. <eula mandatory='true'><![CDATA[http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html]]></eula>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=auvergne&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:2154</code><code>EPSG:4326</code><code>EPSG:3785</code><code>EPSG:3857</code><code>EPSG:900913</code><code>EPSG:4171</code>
+#. </projections>
+#. <bounds min-lat='44.604' min-lon='2.045' max-lat='46.822' max-lon='4.507'>
+#. <shape>
+#. <point lat='45.4023663' lon='2.4599585' /><point lat='45.4286348' lon='2.3254017' /><point lat='44.9943663' lon='2.0451281' />
+#. <point lat='44.6038115' lon='2.1840500' /><point lat='44.6327309' lon='2.5051357' /><point lat='44.9171210' lon='2.7307249' />
+#. <point lat='44.6338266' lon='2.9401391' /><point lat='44.8768328' lon='3.1298041' /><point lat='44.8497399' lon='3.2056710' />
+#. <point lat='44.9439360' lon='3.3391344' /><point lat='44.7949731' lon='3.4520304' /><point lat='44.8615633' lon='3.6424809' />
+#. <point lat='44.7248374' lon='3.8871598' /><point lat='44.9500272' lon='4.3282054' /><point lat='45.1774345' lon='4.5055095' />
+#. <point lat='45.3819241' lon='4.3576878' /><point lat='45.3864069' lon='3.9168916' /><point lat='45.5071399' lon='4.0149721' />
+#. <point lat='45.6838545' lon='3.8053434' /><point lat='45.9552827' lon='3.7322737' /><point lat='45.9681345' lon='3.8489116' />
+#. <point lat='46.2250239' lon='3.8135926' /><point lat='46.3179797' lon='4.0296102' /><point lat='46.4658971' lon='4.0317945' />
+#. <point lat='46.5490366' lon='3.7600585' /><point lat='46.7794611' lon='3.6255192' /><point lat='46.6855890' lon='3.4878525' />
+#. <point lat='46.6999834' lon='3.1728686' /><point lat='46.8217147' lon='2.9377911' /><point lat='46.6718198' lon='2.5467951' />
+#. <point lat='46.5508339' lon='2.5662523' /><point lat='46.4813144' lon='2.2747709' /><point lat='46.3216155' lon='2.2762271' />
+#. <point lat='46.2543249' lon='2.4722891' /><point lat='46.0383633' lon='2.5720279' /><point lat='45.9014582' lon='2.5141257' />
+#. <point lat='45.8340658' lon='2.3591137' /><point lat='45.7131887' lon='2.4954764' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009-2010</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
 #. <country-code>FR</country-code>
 #. </entry>
+#. <entry>
+#. <name>CRAIG - Moulins 15 cm</name>
+#: build/trans_wms.java:594
+msgid "CRAIG - Moulins 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=moulins&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='46.375' min-lon='3.114' max-lat='46.727' max-lon='3.583'>
+#. <shape>
+#. <point lat='46.6531780' lon='3.1146301' /><point lat='46.5920091' lon='3.1831503' /><point lat='46.5181677' lon='3.1242169' />
+#. <point lat='46.4572002' lon='3.2021956' /><point lat='46.4032478' lon='3.2019816' /><point lat='46.4367347' lon='3.3192065' />
+#. <point lat='46.3753806' lon='3.4843655' /><point lat='46.4629787' lon='3.5047376' /><point lat='46.4693756' lon='3.5831443' />
+#. <point lat='46.5367773' lon='3.5542126' /><point lat='46.5643267' lon='3.4371161' /><point lat='46.5980967' lon='3.5157796' />
+#. <point lat='46.6585831' lon='3.5065351' /><point lat='46.7195593' lon='3.4479710' /><point lat='46.6929990' lon='3.3202336' />
+#. <point lat='46.7268725' lon='3.2620707' /><point lat='46.6932339' lon='3.2127240' /><point lat='46.7204103' lon='3.1343174' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>CRAIG - Montluçon 15 cm</name>
+#: build/trans_wms.java:613
+msgid "CRAIG - Montluçon 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=montlucon&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='46.227' min-lon='2.402' max-lat='46.423' max-lon='2.665'>
+#. <shape>
+#. <point lat='46.4024966' lon='2.6645100' /><point lat='46.3421301' lon='2.6649110' /><point lat='46.2268652' lon='2.5389734' />
+#. <point lat='46.3068755' lon='2.4026079' /><point lat='46.3342581' lon='2.4900995' /><point lat='46.4154942' lon='2.5186332' />
+#. <point lat='46.4189481' lon='2.6050667' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>CRAIG - Vichy 15 cm</name>
+#: build/trans_wms.java:629
+msgid "CRAIG - Vichy 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=vichy&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='45.997' min-lon='3.249' max-lat='46.260' max-lon='3.569'>
+#. <shape>
+#. <point lat='46.2602882' lon='3.4354624' /><point lat='46.2328672' lon='3.5512292' /><point lat='46.1249603' lon='3.5210969' />
+#. <point lat='46.0103395' lon='3.5585919' /><point lat='45.9971752' lon='3.4621047' /><point lat='46.0582033' lon='3.4238371' />
+#. <point lat='46.0382361' lon='3.3170331' /><point lat='46.1122644' lon='3.2496785' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>CRAIG - Le Puy 15 cm</name>
+#: build/trans_wms.java:645
+msgid "CRAIG - Le Puy 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=le_puy&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='44.866' min-lon='3.615' max-lat='45.145' max-lon='4.063'>
+#. <shape>
+#. <point lat='44.9473147' lon='3.9287401' /><point lat='44.8865557' lon='3.9277539' /><point lat='44.8668246' lon='3.8609471' />
+#. <point lat='44.9481465' lon='3.8241594' /><point lat='44.9419502' lon='3.7480171' /><point lat='44.9827588' lon='3.7009349' />
+#. <point lat='44.9628982' lon='3.6341145' /><point lat='45.0102731' lon='3.6156193' /><point lat='45.1451214' lon='3.6552711' />
+#. <point lat='45.1377837' lon='3.7506111' /><point lat='45.0969140' lon='3.7977339' /><point lat='45.1228864' lon='3.9316853' />
+#. <point lat='45.0136399' lon='4.0631198' /><point lat='44.9867619' lon='4.0530756' /><point lat='45.0007606' lon='3.9962471' />
+#. <point lat='44.9536830' lon='3.9763543' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2010</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>Géolittoral - Ortophotos 2000</name>
+#: build/trans_wms.java:664
+msgid "Géolittoral - Ortophotos 2000"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ortholittorale&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lon='-5.1986731' min-lat='43.3035717' max-lon='2.6068264' max-lat='51.1214375'>
+#. <shape>
+#. <point lat='48.8634633' lon='-1.9396630' /><point lat='48.9117889' lon='-1.9399349' /><point lat='48.9110507' lon='-1.7009983' />
+#. <point lat='48.8617305' lon='-1.6972613' />
+#. </shape>
+#. <shape>
+#. <point lat='47.4054194' lon='-3.0601800' /><point lat='47.2963471' lon='-2.8258703' /><point lat='47.3341715' lon='-2.7878715' />
+#. <point lat='47.4456259' lon='-3.0243638' />
+#. </shape>
+#. <shape>
+#. <point lat='47.4295047' lon='-3.2648203' /><point lat='47.3592752' lon='-3.3343030' /><point lat='47.3413278' lon='-3.2961388' />
+#. <point lat='47.3005706' lon='-3.3148902' /><point lat='47.2449216' lon='-3.1994054' /><point lat='47.2775103' lon='-3.1656728' />
+#. <point lat='47.2361201' lon='-3.0868640' /><point lat='47.3085541' lon='-3.0063687' />
+#. </shape>
+#. <shape>
+#. <point lat='46.6924223' lon='-2.4123238' /><point lat='46.6761120' lon='-2.3719717' /><point lat='46.6803260' lon='-2.2674923' />
+#. <point lat='46.7070521' lon='-2.2700680' /><point lat='46.7328597' lon='-2.2982682' /><point lat='46.7371145' lon='-2.4165505' />
+#. </shape>
+#. <shape>
+#. <point lat='46.1095893' lon='-1.0796243' /><point lat='46.0147437' lon='-0.9411452' /><point lat='45.1517801' lon='-0.5630573' />
+#. <point lat='45.0842493' lon='-0.7265951' /><point lat='45.3409360' lon='-0.8790355' /><point lat='45.3377907' lon='-0.9979449' />
+#. <point lat='44.6998247' lon='-0.9555838' /><point lat='44.1986482' lon='-1.1586189' /><point lat='44.2055773' lon='-1.2151202' />
+#. <point lat='43.9411421' lon='-1.3216793' /><point lat='43.9065485' lon='-1.2760964' /><point lat='43.4681233' lon='-1.4280594' />
+#. <point lat='43.4059107' lon='-1.6062745' /><point lat='43.3601202' lon='-1.6060955' /><point lat='43.3035717' lon='-1.7744064' />
+#. <point lat='43.3848410' lon='-1.8299531' /><point lat='43.4685563' lon='-1.5855116' /><point lat='44.0337366' lon='-1.3570598' />
+#. <point lat='44.0646122' lon='-1.4021655' /><point lat='44.2283161' lon='-1.3358385' /><point lat='44.2303255' lon='-1.2183610' />
+#. <point lat='44.4109713' lon='-1.1679453' /><point lat='44.4184720' lon='-1.3074387' /><point lat='45.5910689' lon='-1.1697949' />
+#. <point lat='46.0604176' lon='-1.4868470' /><point lat='46.0914593' lon='-1.3636417' /><point lat='46.1701852' lon='-1.6017590' />
+#. <point lat='46.2237487' lon='-1.6444184' /><point lat='46.3042640' lon='-1.5859481' /><point lat='46.3388783' lon='-1.5100772' />
+#. <point lat='46.4221446' lon='-1.7564280' /><point lat='46.8185697' lon='-2.1871988' /><point lat='46.8553436' lon='-2.1642284' />
+#. <point lat='46.9337048' lon='-2.2365406' /><point lat='46.9671834' lon='-2.3976918' /><point lat='47.0763113' lon='-2.2820042' />
+#. <point lat='47.0187450' lon='-2.1256261' /><point lat='47.0656240' lon='-2.0901262' /><point lat='47.1069799' lon='-2.1848720' />
+#. <point lat='47.1076296' lon='-2.2647018' /><point lat='47.1856218' lon='-2.2448935' /><point lat='47.2446686' lon='-2.5677926' />
+#. <point lat='47.4668599' lon='-2.6672667' /><point lat='47.4712158' lon='-2.7478721' /><point lat='47.4346122' lon='-2.7577135' />
+#. <point lat='47.4629031' lon='-2.8932063' /><point lat='47.5090529' lon='-2.9036899' /><point lat='47.5383308' lon='-3.0338252' />
+#. <point lat='47.5118452' lon='-3.0711295' /><point lat='47.4987314' lon='-3.0165289' /><point lat='47.4269256' lon='-3.1250228' />
+#. <point lat='47.4844142' lon='-3.1880328' /><point lat='47.6113186' lon='-3.2279087' /><point lat='47.6316051' lon='-3.2966969' />
+#. <point lat='47.6715415' lon='-3.2875957' /><point lat='47.6689257' lon='-3.3407355' /><point lat='47.5947342' lon='-3.3891187' />
+#. <point lat='47.6382724' lon='-3.5508700' /><point lat='47.7248840' lon='-3.5338384' /><point lat='47.7647571' lon='-3.7657669' />
+#. <point lat='47.7370960' lon='-3.7759528' /><point lat='47.7591549' lon='-3.9116771' /><point lat='47.7991129' lon='-3.8959022' />
+#. <point lat='47.8152607' lon='-3.9723628' /><point lat='47.7975006' lon='-3.9972201' /><point lat='47.7626769' lon='-3.9795600' />
+#. <point lat='47.7219346' lon='-3.8945008' /><point lat='47.6783103' lon='-3.9161956' /><point lat='47.7092072' lon='-4.1016259' />
+#. <point lat='47.7894357' lon='-4.0898857' /><point lat='47.7990868' lon='-4.0379763' /><point lat='47.8310926' lon='-4.0412502' />
+#. <point lat='47.8422143' lon='-4.0876491' /><point lat='47.8252534' lon='-4.1478057' /><point lat='47.7884708' lon='-4.1431427' />
+#. <point lat='47.7414997' lon='-4.3516237' /><point lat='47.9776016' lon='-4.4796232' /><point lat='47.9989633' lon='-4.9856536' />
+#. <point lat='48.0897202' lon='-4.9693825' /><point lat='48.0779844' lon='-4.6357600' /><point lat='48.1146852' lon='-4.6014717' />
+#. <point lat='48.1096154' lon='-4.3850007' /><point lat='48.1454286' lon='-4.3895513' /><point lat='48.1500888' lon='-4.3092543' />
+#. <point lat='48.1769373' lon='-4.3126821' /><point lat='48.1846773' lon='-4.4636854' /><point lat='48.1453035' lon='-4.4974841' />
+#. <point lat='48.1475763' lon='-4.5921009' /><point lat='48.2248800' lon='-4.5753669' /><point lat='48.2330974' lon='-4.6710089' />
+#. <point lat='48.3104921' lon='-4.6543410' /><point lat='48.3004956' lon='-4.8424298' /><point lat='48.4492607' lon='-5.1986731' />
+#. <point lat='48.5172155' lon='-5.1034610' /><point lat='48.3941286' lon='-4.8146500' /><point lat='48.5431896' lon='-4.8351542' />
+#. <point lat='48.6637334' lon='-4.6338697' /><point lat='48.7797813' lon='-3.9669223' /><point lat='48.7471474' lon='-3.9493945' />
+#. <point lat='48.7535602' lon='-3.6501973' /><point lat='48.8252653' lon='-3.6585313' /><point lat='48.8583372' lon='-3.5393140' />
+#. <point lat='48.9029653' lon='-3.5444401' /><point lat='48.9186584' lon='-3.4095425' /><point lat='48.8736644' lon='-3.4075537' />
+#. <point lat='48.9275037' lon='-3.0276871' /><point lat='48.5884071' lon='-2.6786137' /><point lat='48.7190877' lon='-2.2847486' />
+#. <point lat='48.6501630' lon='-2.1754283' /><point lat='48.7322121' lon='-2.0136968' /><point lat='48.7317759' lon='-1.8095282' />
+#. <point lat='48.6612609' lon='-1.8039194' /><point lat='48.6858177' lon='-1.6116146' /><point lat='49.2478104' lon='-1.7164548' />
+#. <point lat='49.3272144' lon='-1.8026014' /><point lat='49.3253007' lon='-1.8574757' /><point lat='49.6557284' lon='-1.9262013' />
+#. <point lat='49.6787215' lon='-2.0390800' /><point lat='49.7608677' lon='-2.0044546' /><point lat='49.6849834' lon='-1.6175855' />
+#. <point lat='49.7606702' lon='-1.2837344' /><point lat='49.6350423' lon='-1.1492009' /><point lat='49.5541159' lon='-1.1713375' />
+#. <point lat='49.5524476' lon='-1.2735291' /><point lat='49.3933982' lon='-1.1327984' /><point lat='49.4080413' lon='-0.9305950' />
+#. <point lat='49.3597647' lon='-0.7482671' /><point lat='49.3416700' lon='-0.3893456' /><point lat='49.2999494' lon='-0.2470445' />
+#. <point lat='49.2935335' lon='-0.1245368' /><point lat='49.3761879' lon='0.0273095' /><point lat='49.5465556' lon='0.0180063' />
+#. <point lat='49.6929183' lon='0.1221093' /><point lat='49.8646551' lon='0.5171306' /><point lat='49.9490353' lon='1.0572680' />
+#. <point lat='50.1181936' lon='1.4390814' /><point lat='50.4643666' lon='1.5317687' /><point lat='50.8586668' lon='1.5254895' />
+#. <point lat='50.9591925' lon='1.6411818' /><point lat='51.1214375' lon='2.4521050' /><point lat='51.1212359' lon='2.5928557' />
+#. <point lat='51.0577932' lon='2.6068264' /><point lat='50.8990562' lon='1.7975971' /><point lat='50.8237878' lon='1.6645759' />
+#. <point lat='50.1282048' lon='1.7078633' /><point lat='49.8500000' lon='1.0593618' /><point lat='49.7906207' lon='0.6160689' />
+#. <point lat='49.6502699' lon='0.2473107' /><point lat='49.5317374' lon='0.1709048' /><point lat='49.4962230' lon='0.5706464' />
+#. <point lat='49.3395965' lon='0.4111492' /><point lat='49.3573571' lon='0.1950421' /><point lat='49.2547917' lon='0.0171786' />
+#. <point lat='49.2631234' lon='-0.2445265' /><point lat='49.3049516' lon='-0.3840751' /><point lat='49.3243829' lon='-0.7409079' />
+#. <point lat='49.3713264' lon='-0.9954050' /><point lat='49.2517481' lon='-1.0545337' /><point lat='49.2902182' lon='-1.2770400' />
+#. <point lat='49.4346254' lon='-1.2596644' /><point lat='49.5398482' lon='-1.3914123' /><point lat='49.6205575' lon='-1.2753453' />
+#. <point lat='49.6594602' lon='-1.2977482' /><point lat='49.5713903' lon='-1.4904980' /><point lat='49.6339843' lon='-1.7751700' />
+#. <point lat='49.4815523' lon='-1.7460051' /><point lat='49.2469097' lon='-1.5129407' /><point lat='48.7260698' lon='-1.4826149' />
+#. <point lat='48.7253120' lon='-1.3057444' /><point lat='48.5973085' lon='-1.2832340' /><point lat='48.4347142' lon='-2.7611439' />
+#. <point lat='48.6764625' lon='-3.0017371' /><point lat='48.7209691' lon='-3.2106150' /><point lat='48.5605102' lon='-3.9540369' />
+#. <point lat='48.6079181' lon='-4.1564328' /><point lat='48.5585184' lon='-4.4447478' /><point lat='48.4829910' lon='-4.6368255' />
+#. <point lat='48.4472691' lon='-4.6318979' /><point lat='48.4308800' lon='-4.2502228' /><point lat='48.2180466' lon='-4.0614098' />
+#. <point lat='48.0516486' lon='-4.1757039' /><point lat='48.0140984' lon='-4.3190366' /><point lat='47.8997734' lon='-4.2678092' />
+#. <point lat='47.9817224' lon='-3.8848444' /><point lat='47.8640348' lon='-3.7637481' /><point lat='47.5263402' lon='-2.3272701' />
+#. <point lat='47.3338959' lon='-2.3691075' /><point lat='47.3350685' lon='-1.7406713' /><point lat='47.2045060' lon='-1.7706224' />
+#. <point lat='47.2194206' lon='-2.0367815' /><point lat='47.1554772' lon='-2.0968030' /><point lat='47.0123909' lon='-1.8878613' />
+#. <point lat='46.8300739' lon='-2.0879728' /><point lat='46.8343598' lon='-2.0121404' /><point lat='46.6965096' lon='-1.8407867' />
+#. <point lat='46.6548360' lon='-1.8731840' /><point lat='46.5039205' lon='-1.6885850' /><point lat='46.5151306' lon='-1.6211652' />
+#. <point lat='46.4167482' lon='-1.4242755' /><point lat='46.3591735' lon='-1.0176087' />
+#. </shape>
+#. </bounds>
+#. <attribution-text mandatory='true'>Ortho littorale 2000</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/G%C3%A9oLittoral</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>Géolittoral - Sentiers</name>
+#: build/trans_wms.java:760
+msgid "Géolittoral - Sentiers"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/png&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Sentiers_littoraux&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <attribution-text mandatory='true'>Ortho littorale 2000</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/G%C3%A9oLittoral</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#.
 #. <!--only for Spain-->
-#. <!--false;PNOA Spain;http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS-->
+#.
 #. <entry>
 #. <name>PNOA Spain</name>
-#: build/trans_wms.java:311
+#: build/trans_wms.java:771
 msgid "PNOA Spain"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&]]></url>
-#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS]]></eula>
+#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS={proj}&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Nacional&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>PNOA</attribution-text>
 #. <country-code>ES</country-code>
 #. </entry>
+#.
+#. <entry>
+#. <name>SIGPAC Spain</name>
+#: build/trans_wms.java:780
+msgid "SIGPAC Spain"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.marm.es/wms/wms.aspx?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ORTOFOTOS&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='27.6302571' min-lon='-18.1661033' max-lat='43.8098190' max-lon='4.3987393'>
+#. <shape>
+#. <point lat='28.4460601' lon='-17.8846298'/><point lat='28.5225529' lon='-17.8939535'/><point lat='28.7481927' lon='-18.0212548'/>
+#. <point lat='28.8038375' lon='-18.0224091'/><point lat='28.8726124' lon='-17.9424017'/><point lat='28.8737099' lon='-17.8911792'/>
+#. <point lat='28.8515102' lon='-17.8903302'/><point lat='28.8537764' lon='-17.7675902'/><point lat='28.8312183' lon='-17.7669837'/>
+#. <point lat='28.8319975' lon='-17.7412714'/><point lat='28.7642235' lon='-17.7394926'/><point lat='28.7649677' lon='-17.7139824'/>
+#. <point lat='28.7303731' lon='-17.7129312'/><point lat='28.6931782' lon='-17.7574427'/><point lat='28.6741254' lon='-17.7570788'/>
+#. <point lat='28.6743524' lon='-17.7457913'/><point lat='28.6165627' lon='-17.7457266'/><point lat='28.5833675' lon='-17.7519687'/>
+#. <point lat='28.5591958' lon='-17.7622536'/><point lat='28.5416670' lon='-17.7833086'/><point lat='28.4936643' lon='-17.7831575'/>
+#. <point lat='28.4925024' lon='-17.8086110'/><point lat='28.4468974' lon='-17.8060072'/><point lat='28.4460601' lon='-17.8846298'/>
+#. </shape>
+#. <shape>
+#. <point lat='27.7851643' lon='-18.1661033'/><point lat='27.6949247' lon='-18.1634940'/><point lat='27.6963366' lon='-18.0889827'/>
+#. <point lat='27.6738724' lon='-18.0873398'/><point lat='27.6753701' lon='-18.0364092'/><point lat='27.6302571' lon='-18.0350079'/>
+#. <point lat='27.6323976' lon='-17.9589987'/><point lat='27.7926025' lon='-17.8603269'/><point lat='27.8368793' lon='-17.8630328'/>
+#. <point lat='27.8364947' lon='-17.8884015'/><point lat='27.8590536' lon='-17.8891263'/><point lat='27.8567467' lon='-17.9906491'/>
+#. <point lat='27.7655831' lon='-18.0386803'/><point lat='27.7637873' lon='-18.1146412'/><point lat='27.7863613' lon='-18.1154627'/>
+#. <point lat='27.7851643' lon='-18.1661033'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.0639801' lon='-17.3603800'/><point lat='28.1757247' lon='-17.3629657'/><point lat='28.1763688' lon='-17.3375583'/>
+#. <point lat='28.2213012' lon='-17.3384577'/><point lat='28.2238767' lon='-17.1857883'/><point lat='28.1351849' lon='-17.0820788'/>
+#. <point lat='28.0679977' lon='-17.0808422'/><point lat='28.0668073' lon='-17.1315446'/><point lat='28.0214628' lon='-17.1563337'/>
+#. <point lat='28.0203711' lon='-17.2321063'/><point lat='27.9980388' lon='-17.2319938'/><point lat='27.9978403' lon='-17.2576823'/>
+#. <point lat='28.0199741' lon='-17.2578510'/><point lat='28.0192298' lon='-17.3086658'/><point lat='28.0639801' lon='-17.3603800'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.3275779' lon='-16.9278171'/><point lat='28.3721879' lon='-16.9286591'/><point lat='28.3729288' lon='-16.8776666'/>
+#. <point lat='28.3954191' lon='-16.8780707'/><point lat='28.4226146' lon='-16.5214259'/><point lat='28.4911350' lon='-16.4457117'/>
+#. <point lat='28.5359720' lon='-16.4462506'/><point lat='28.5362679' lon='-16.4205859'/><point lat='28.5588419' lon='-16.4209227'/>
+#. <point lat='28.5597589' lon='-16.3443329'/><point lat='28.5822095' lon='-16.3446023'/><point lat='28.5837179' lon='-16.1912541'/>
+#. <point lat='28.6068435' lon='-16.1916246'/><point lat='28.6078193' lon='-16.1279344'/><point lat='28.5921762' lon='-16.1277997'/>
+#. <point lat='28.5925015' lon='-16.0995079'/><point lat='28.5163822' lon='-16.0993395'/><point lat='28.5161158' lon='-16.1648148'/>
+#. <point lat='28.4938583' lon='-16.1647474'/><point lat='28.4484704' lon='-16.2385755'/><point lat='28.4476116' lon='-16.2653516'/>
+#. <point lat='28.4030038' lon='-16.2658569'/><point lat='28.4017594' lon='-16.3167484'/><point lat='28.3801890' lon='-16.3163105'/>
+#. <point lat='28.3795075' lon='-16.3420763'/><point lat='28.2892963' lon='-16.3408301'/><point lat='28.1976134' lon='-16.4158370'/>
+#. <point lat='28.1311312' lon='-16.4150960'/><point lat='28.0164796' lon='-16.5153297'/><point lat='28.0153200' lon='-16.6168433'/>
+#. <point lat='27.9930469' lon='-16.6168096'/><point lat='27.9919168' lon='-16.7184243'/><point lat='28.0371426' lon='-16.7190979'/>
+#. <point lat='28.0367859' lon='-16.7446952'/><point lat='28.0818146' lon='-16.7453351'/><point lat='28.0816065' lon='-16.7706967'/>
+#. <point lat='28.1259036' lon='-16.8223966'/><point lat='28.1708652' lon='-16.8231712'/><point lat='28.1707464' lon='-16.8487012'/>
+#. <point lat='28.2607910' lon='-16.8502842'/><point lat='28.2605537' lon='-16.8756457'/><point lat='28.2832162' lon='-16.8760836'/>
+#. <point lat='28.2827713' lon='-16.9015125'/><point lat='28.3279337' lon='-16.9023882'/><point lat='28.3275779' lon='-16.9278171'/>
+#. </shape>
+#. <shape>
+#. <point lat='27.9008901' lon='-15.8537427'/><point lat='27.9901812' lon='-15.8542032'/><point lat='27.9906555' lon='-15.8289530'/>
+#. <point lat='28.0355780' lon='-15.8291065'/><point lat='28.0363232' lon='-15.7782992'/><point lat='28.0814298' lon='-15.7532793'/>
+#. <point lat='28.0815652' lon='-15.7278756'/><point lat='28.1718567' lon='-15.7282593'/><point lat='28.1728039' lon='-15.4989741'/>
+#. <point lat='28.1504075' lon='-15.4987438'/><point lat='28.1507459' lon='-15.4497785'/><point lat='28.1961425' lon='-15.4501622'/>
+#. <point lat='28.1961425' lon='-15.3972827'/><point lat='28.0383554' lon='-15.3964385'/><point lat='28.0380167' lon='-15.3710348'/>
+#. <point lat='28.0153212' lon='-15.3706511'/><point lat='28.0153212' lon='-15.3457847'/><point lat='27.9254406' lon='-15.3454777'/>
+#. <point lat='27.9252372' lon='-15.3708046'/><point lat='27.8352137' lon='-15.3705743'/><point lat='27.8347387' lon='-15.3959780'/>
+#. <point lat='27.7879673' lon='-15.4209979'/><point lat='27.7893932' lon='-15.4718052'/><point lat='27.7666454' lon='-15.4718820'/>
+#. <point lat='27.7667813' lon='-15.5227660'/><point lat='27.7216112' lon='-15.5477092'/><point lat='27.7213395' lon='-15.6236132'/>
+#. <point lat='27.7419910' lon='-15.6241504'/><point lat='27.7433495' lon='-15.7007451'/><point lat='27.8110501' lon='-15.8016690'/>
+#. <point lat='27.9008901' lon='-15.8537427'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.0467778' lon='-14.5215621'/><point lat='28.1184131' lon='-14.5224358'/><point lat='28.1156076' lon='-14.4157526'/>
+#. <point lat='28.2278805' lon='-14.2168794'/><point lat='28.3390300' lon='-14.2153651'/><point lat='28.4528287' lon='-14.1641672'/>
+#. <point lat='28.4747955' lon='-14.1115132'/><point lat='28.7226671' lon='-14.0335806'/><point lat='28.7449351' lon='-13.9565217'/>
+#. <point lat='28.7665857' lon='-13.9561722'/><point lat='28.7664325' lon='-13.8290221'/><point lat='28.7879765' lon='-13.8289639'/>
+#. <point lat='28.7879255' lon='-13.8000741'/><point lat='28.7189894' lon='-13.8012972'/><point lat='28.7193470' lon='-13.8275660'/>
+#. <point lat='28.6517968' lon='-13.8278572'/><point lat='28.6518990' lon='-13.8025786'/><point lat='28.5384172' lon='-13.8033941'/>
+#. <point lat='28.5384684' lon='-13.8288474'/><point lat='28.3970177' lon='-13.8315061'/><point lat='28.2241438' lon='-13.9158189'/>
+#. <point lat='28.2235696' lon='-13.9856445'/><point lat='28.1795787' lon='-14.0369588'/><point lat='28.1799894' lon='-14.1387139'/>
+#. <point lat='28.1579103' lon='-14.1386556'/><point lat='28.1578076' lon='-14.2153651'/><point lat='28.1118888' lon='-14.2147244'/>
+#. <point lat='28.0452356' lon='-14.2913173'/><point lat='28.0368713' lon='-14.3319673'/><point lat='28.0469834' lon='-14.4457846'/>
+#. <point lat='28.0657961' lon='-14.4466583'/><point lat='28.0682631' lon='-14.4962835'/><point lat='28.0458525' lon='-14.4959340'/>
+#. <point lat='28.0467778' lon='-14.5215621'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.8456579' lon='-13.8006620'/><point lat='28.8231121' lon='-13.8009273'/><point lat='28.8230539' lon='-13.7756880'/>
+#. <point lat='28.8898184' lon='-13.6972900'/><point lat='28.9127744' lon='-13.6972900'/><point lat='28.9117991' lon='-13.6072498'/>
+#. <point lat='29.0002417' lon='-13.4388551'/><point lat='29.1351289' lon='-13.4374559'/><point lat='29.1349931' lon='-13.4117005'/>
+#. <point lat='29.2229789' lon='-13.4105556'/><point lat='29.2555860' lon='-13.4592801'/><point lat='29.2942023' lon='-13.4597392'/>
+#. <point lat='29.2945638' lon='-13.5091254'/><point lat='29.3163453' lon='-13.5100581'/><point lat='29.3172941' lon='-13.5635382'/>
+#. <point lat='29.2713764' lon='-13.5640564'/><point lat='29.2711956' lon='-13.5389228'/><point lat='29.2500375' lon='-13.5389747'/>
+#. <point lat='29.2501279' lon='-13.5661293'/><point lat='29.2030039' lon='-13.5665956'/><point lat='29.2022349' lon='-13.5156549'/>
+#. <point lat='29.1820579' lon='-13.5156549'/><point lat='29.1827819' lon='-13.5398038'/><point lat='29.1375280' lon='-13.5408921'/>
+#. <point lat='29.1368528' lon='-13.6578200'/><point lat='29.0935079' lon='-13.7132220'/><point lat='29.0934533' lon='-13.7663353'/>
+#. <point lat='29.0165937' lon='-13.8502463'/><point lat='28.9834250' lon='-13.8518224'/><point lat='28.9148610' lon='-13.8524443'/>
+#. <point lat='28.8924500' lon='-13.9013122'/><point lat='28.8469779' lon='-13.9024005'/><point lat='28.8456579' lon='-13.8006620'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.9990693' lon='1.6479916'/><point lat='38.9993635' lon='1.7321668'/><point lat='39.0441733' lon='1.7314703'/>
+#. <point lat='39.0431944' lon='1.6489512'/><point lat='39.1276358' lon='1.6481552'/><point lat='39.1265691' lon='1.3948608'/>
+#. <point lat='39.0864199' lon='1.3954412'/><point lat='39.0852615' lon='1.2281145'/><point lat='39.0028958' lon='1.2291095'/>
+#. <point lat='39.0018003' lon='1.1448657'/><point lat='38.8319988' lon='1.1452803'/><point lat='38.8331615' lon='1.3113632'/>
+#. <point lat='38.7906483' lon='1.3121924'/><point lat='38.7916178' lon='1.3946949'/><point lat='38.7529597' lon='1.3951924'/>
+#. <point lat='38.7519251' lon='1.3112803'/><point lat='38.6238804' lon='1.3125919'/><point lat='38.6251112' lon='1.6489036'/>
+#. <point lat='38.7111504' lon='1.6480745'/><point lat='38.7101152' lon='1.5845600'/><point lat='38.7005387' lon='1.5811604'/>
+#. <point lat='38.7002798' lon='1.5491544'/><point lat='38.7092094' lon='1.5197188'/><point lat='38.7253185' lon='1.5035500'/>
+#. <point lat='38.9155064' lon='1.4813282'/><point lat='38.9254411' lon='1.5518906'/><point lat='38.9566554' lon='1.5667328'/>
+#. <point lat='38.9583318' lon='1.6487378'/><point lat='38.9990693' lon='1.6479916'/>
+#. </shape>
+#. <shape>
+#. <point lat='39.4166673' lon='2.5450749'/><point lat='39.4161122' lon='2.4393300'/><point lat='39.4846853' lon='2.4387140'/>
+#. <point lat='39.4993424' lon='2.4390220'/><point lat='39.4993424' lon='2.3122308'/><point lat='39.5417911' lon='2.3119228'/>
+#. <point lat='39.5409994' lon='2.2290722'/><point lat='39.6260571' lon='2.2283536'/><point lat='39.6270851' lon='2.3460076'/>
+#. <point lat='39.9601558' lon='2.9270445'/><point lat='39.9600498' lon='3.1456647'/><point lat='40.0019797' lon='3.1460753'/>
+#. <point lat='40.0019797' lon='3.2313899'/><point lat='39.8329231' lon='3.2312872'/><point lat='39.8331596' lon='3.1482313'/>
+#. <point lat='39.7935717' lon='3.1484366'/><point lat='39.7931773' lon='3.4814817'/><point lat='39.5959027' lon='3.4803472'/>
+#. <point lat='39.4784606' lon='3.3150618'/><point lat='39.3785504' lon='3.3146179'/><point lat='39.2499355' lon='3.0830178'/>
+#. <point lat='39.2501482' lon='2.9798608'/><point lat='39.3334971' lon='2.9790395'/><point lat='39.3334177' lon='2.7287424'/>
+#. <point lat='39.4581361' lon='2.7288451'/><point lat='39.4577397' lon='2.6456865'/><point lat='39.4996593' lon='2.6453785'/>
+#. <point lat='39.4994216' lon='2.5452802'/><point lat='39.4166673' lon='2.5450749'/>
+#. </shape>
+#. <shape>
+#. <point lat='40.0434431' lon='3.8120402'/><point lat='40.0437979' lon='3.7290820'/><point lat='39.9584155' lon='3.7286185'/>
+#. <point lat='39.9576011' lon='3.8126633'/><point lat='39.9164393' lon='3.8122771'/><point lat='39.9159813' lon='3.9608975'/>
+#. <point lat='39.7913080' lon='4.1938142'/><point lat='39.7905799' lon='4.3150279'/><point lat='39.8329294' lon='4.3159934'/>
+#. <point lat='39.8320396' lon='4.3987393'/><point lat='39.9185834' lon='4.3973664'/><point lat='39.9193274' lon='4.3158003'/>
+#. <point lat='40.0433985' lon='4.3161865'/><point lat='40.0443594' lon='4.2318959'/><point lat='40.0847793' lon='4.2324752'/>
+#. <point lat='40.0861090' lon='4.1491501'/><point lat='40.1255157' lon='4.1490623'/><point lat='40.1272166' lon='4.0627981'/>
+#. <point lat='40.0849941' lon='4.0624217'/><point lat='40.0852940' lon='3.8128687'/><point lat='40.0434431' lon='3.8120402'/>
+#. </shape>
+#. <shape>
+#. <point lat='41.8228891' lon='-8.8910646'/><point lat='42.5751065' lon='-9.1092038'/><point lat='42.7306560' lon='-9.0365469'/>
+#. <point lat='42.7269569' lon='-9.0883419'/><point lat='42.7750272' lon='-9.1466113'/><point lat='42.9016271' lon='-9.2185488'/>
+#. <point lat='42.8605106' lon='-9.2760988'/><point lat='42.9311297' lon='-9.3099094'/><point lat='42.9821991' lon='-9.2789763'/>
+#. <point lat='43.0600377' lon='-9.3099094'/><point lat='43.1041725' lon='-9.2523594'/><point lat='43.1703151' lon='-9.2314975'/>
+#. <point lat='43.2101760' lon='-9.1473307'/><point lat='43.1991644' lon='-9.0674800'/><point lat='43.2426748' lon='-9.0336694'/>
+#. <point lat='43.2447709' lon='-8.9984200'/><point lat='43.2955793' lon='-8.9998588'/><point lat='43.3055265' lon='-8.9372732'/>
+#. <point lat='43.3269860' lon='-8.9293600'/><point lat='43.3290792' lon='-8.8638969'/><point lat='43.3740655' lon='-8.8761263'/>
+#. <point lat='43.3735426' lon='-8.8221732'/><point lat='43.3191358' lon='-8.7854850'/><point lat='43.3050030' lon='-8.7063538'/>
+#. <point lat='43.3296025' lon='-8.6099575'/><point lat='43.3233227' lon='-8.5509688'/><point lat='43.3364048' lon='-8.5243519'/>
+#. <point lat='43.3646525' lon='-8.5250713'/><point lat='43.3918416' lon='-8.4574500'/><point lat='43.4111803' lon='-8.3610538'/>
+#. <point lat='43.4634161' lon='-8.3603344'/><point lat='43.5797394' lon='-8.3344369'/><point lat='43.5708796' lon='-8.2776063'/>
+#. <point lat='43.7239184' lon='-8.0646713'/><point lat='43.7233986' lon='-7.9992081'/><point lat='43.7826357' lon='-7.9171994'/>
+#. <point lat='43.7914643' lon='-7.8560525'/><point lat='43.7374337' lon='-7.8359100'/><point lat='43.8098190' lon='-7.6628443'/>
+#. <point lat='43.6782695' lon='-7.3188932'/><point lat='43.5830817' lon='-7.1997467'/><point lat='43.6075032' lon='-6.2488228'/>
+#. <point lat='43.5790105' lon='-6.1229322'/><point lat='43.6798953' lon='-5.8520425'/><point lat='43.5708672' lon='-5.6036334'/>
+#. <point lat='43.5619084' lon='-5.2855347'/><point lat='43.4991591' lon='-5.1787525'/><point lat='43.4836655' lon='-4.9089869'/>
+#. <point lat='43.4192021' lon='-4.6156167'/><point lat='43.4249168' lon='-4.1839917'/><point lat='43.5195394' lon='-3.8029478'/>
+#. <point lat='43.4869277' lon='-3.7400025'/><point lat='43.5423572' lon='-3.5612827'/><point lat='43.3816347' lon='-3.1083013'/>
+#. <point lat='43.4624573' lon='-2.9385737'/><point lat='43.4755094' lon='-2.7452417'/><point lat='43.3170625' lon='-2.3046245'/>
+#. <point lat='43.3563045' lon='-1.9854018'/><point lat='43.3972545' lon='-1.8552841'/><point lat='43.3964383' lon='-1.7698020'/>
+#. <point lat='43.3760501' lon='-1.7700492'/><point lat='43.3756908' lon='-1.7100474'/><point lat='43.3312527' lon='-1.7113451'/>
+#. <point lat='43.3131806' lon='-1.7225915'/><point lat='43.3129108' lon='-1.6890375'/><point lat='43.3341294' lon='-1.6881106'/>
+#. <point lat='43.3337248' lon='-1.6446695'/><point lat='43.3133155' lon='-1.6449785'/><point lat='43.3129528' lon='-1.6029903'/>
+#. <point lat='43.2926624' lon='-1.6034352'/><point lat='43.2921227' lon='-1.5635905'/><point lat='43.3133844' lon='-1.5630468'/>
+#. <point lat='43.3128355' lon='-1.4779905'/><point lat='43.2761368' lon='-1.3667723'/><point lat='43.2381533' lon='-1.3568809'/>
+#. <point lat='43.1712972' lon='-1.3703692'/><point lat='43.0833554' lon='-1.4423067'/><point lat='43.0603647' lon='-1.4198262'/>
+#. <point lat='43.0511660' lon='-1.3730668'/><point lat='43.1115893' lon='-1.3640746'/><point lat='43.1352170' lon='-1.3020285'/>
+#. <point lat='43.1332484' lon='-1.2354864'/><point lat='43.0774443' lon='-1.2795481'/><point lat='43.0649635' lon='-1.1923239'/>
+#. <point lat='43.0077821' lon='-1.0061856'/><point lat='42.9748951' lon='-.9423410'/><point lat='42.9821318' lon='-.7562028'/>
+#. <point lat='42.9610774' lon='-.7148387'/><point lat='42.9031405' lon='-.6968543'/><point lat='42.8220693' lon='-.5511809'/>
+#. <point lat='42.8484456' lon='-.5044215'/><point lat='42.8200906' lon='-.4288871'/><point lat='42.8655842' lon='-.3164848'/>
+#. <point lat='42.8108560' lon='-.1456332'/><point lat='42.7124874' lon='-.0314324'/><point lat='42.7540985' lon='.1861785'/>
+#. <point lat='42.7177729' lon='.3021777'/><point lat='42.7428729' lon='.3642238'/><point lat='42.7144695' lon='.4487504'/>
+#. <point lat='42.7223973' lon='.6276949'/><point lat='42.8576747' lon='.6411832'/><point lat='42.8827180' lon='.7149192'/>
+#. <point lat='42.8181119' lon='.9675996'/><point lat='42.7989808' lon='1.1087770'/><point lat='42.7342872' lon='1.1753192'/>
+#. <point lat='42.7415521' lon='1.3632559'/><point lat='42.7093914' lon='1.4113736'/><point lat='42.7103407' lon='1.4806054'/>
+#. <point lat='42.5010664' lon='1.4813006'/><point lat='42.5020345' lon='1.6443591'/><point lat='42.5424539' lon='1.6432777'/>
+#. <point lat='42.5434214' lon='1.7304070'/><point lat='42.5011803' lon='1.7316429'/><point lat='42.5016359' lon='2.0638621'/>
+#. <point lat='42.4590247' lon='2.0645572'/><point lat='42.4599364' lon='2.3969309'/><point lat='42.4178363' lon='2.3976786'/>
+#. <point lat='42.4179732' lon='2.4804823'/><point lat='42.3759441' lon='2.4809767'/><point lat='42.3762636' lon='2.6447922'/>
+#. <point lat='42.4592447' lon='2.6444832'/><point lat='42.4596094' lon='2.8113266'/><point lat='42.5010358' lon='2.8112648'/>
+#. <point lat='42.5008535' lon='3.0638780'/><point lat='42.4591535' lon='3.0638780'/><point lat='42.4593359' lon='3.2307832'/>
+#. <point lat='42.3764363' lon='3.2304935'/><point lat='42.3760369' lon='3.3141469'/><point lat='42.3339864' lon='3.3141243'/>
+#. <point lat='42.3340435' lon='3.3978550'/><point lat='42.2900940' lon='3.3973912'/><point lat='42.2908368' lon='3.3138923'/>
+#. <point lat='42.2070151' lon='3.3139695'/><point lat='42.2073012' lon='3.1475896'/><point lat='42.1260612' lon='3.1475896'/>
+#. <point lat='42.1260039' lon='3.2305478'/><point lat='41.9529359' lon='3.2466753'/><point lat='41.8558943' lon='3.1945206'/>
+#. <point lat='41.7647419' lon='3.0605370'/><point lat='41.6371796' lon='2.7835777'/><point lat='41.4271601' lon='2.2629300'/>
+#. <point lat='41.2989297' lon='2.1649151'/><point lat='41.2232228' lon='1.8600800'/><point lat='41.1162730' lon='1.3763003'/>
+#. <point lat='41.0464585' lon='1.1793714'/><point lat='41.0484930' lon='1.0858526'/><point lat='40.8195599' lon='.7585370'/>
+#. <point lat='40.7337610' lon='.9114042'/><point lat='40.6751363' lon='.8781331'/><point lat='40.5358666' lon='.6650182'/>
+#. <point lat='40.5502166' lon='.5580112'/><point lat='40.3757589' lon='.4339190'/><point lat='40.1919192' lon='.2675635'/>
+#. <point lat='40.0647234' lon='.1641534'/><point lat='40.0144671' lon='.0751307'/><point lat='39.8952188' lon='.0103870'/>
+#. <point lat='39.8116904' lon='-.0939224'/><point lat='39.6311716' lon='-.1847435'/><point lat='39.5036254' lon='-.2908513'/>
+#. <point lat='39.3334310' lon='-.2863552'/><point lat='39.1774612' lon='-.1856427'/><point lat='39.1558487' lon='-.2135185'/>
+#. <point lat='38.9722246' lon='-.1110076'/><point lat='38.8826835' lon='.0094878'/><point lat='38.8721830' lon='.1218901'/>
+#. <point lat='38.7986360' lon='.2342925'/><point lat='38.7264162' lon='.2558737'/><point lat='38.6133825' lon='.0958128'/>
+#. <point lat='38.6070586' lon='-.0022021'/><point lat='38.5269073' lon='-.0570544'/><point lat='38.4762395' lon='-.2719677'/>
+#. <point lat='38.3931234' lon='-.3798740'/><point lat='38.3381297' lon='-.3834708'/><point lat='38.3310763' lon='-.4509122'/>
+#. <point lat='38.2830943' lon='-.5048654'/><point lat='38.1948095' lon='-.4823849'/><point lat='38.1658287' lon='-.4293310'/>
+#. <point lat='38.1488590' lon='-.4545091'/><point lat='38.1721913' lon='-.5839966'/><point lat='38.1198599' lon='-.6136708'/>
+#. <point lat='37.9612228' lon='-.6370505'/><point lat='37.9456238' lon='-.6811123'/><point lat='37.8810656' lon='-.7323677'/>
+#. <point lat='37.7830562' lon='-.7215771'/><point lat='37.7340026' lon='-.6883060'/><point lat='37.6231485' lon='-.6641461'/>
+#. <point lat='37.5878413' lon='-.7193941'/><point lat='37.5375806' lon='-.9196258'/><point lat='37.5164093' lon='-1.1107098'/>
+#. <point lat='37.5286671' lon='-1.3383246'/><point lat='37.3903714' lon='-1.4408917'/><point lat='37.2765189' lon='-1.6766966'/>
+#. <point lat='36.9122889' lon='-1.8540816'/><point lat='36.6929117' lon='-2.0683486'/><point lat='36.6619233' lon='-2.2158766'/>
+#. <point lat='36.7801753' lon='-2.3721861'/><point lat='36.6591056' lon='-2.6812926'/><point lat='36.6675585' lon='-2.9201476'/>
+#. <point lat='36.7126250' lon='-3.0940200'/><point lat='36.6548788' lon='-3.4610839'/><point lat='36.6929117' lon='-3.7280395'/>
+#. <point lat='36.6633322' lon='-4.3743529'/><point lat='36.4404171' lon='-4.6571151'/><point lat='36.4531321' lon='-4.9188018'/>
+#. <point lat='36.3513541' lon='-5.1699508'/><point lat='36.1970201' lon='-5.2841094'/><point lat='36.1241812' lon='-5.2680911'/>
+#. <point lat='36.1224654' lon='-5.3524784'/><point lat='36.0401413' lon='-5.3516094'/><point lat='36.0388921' lon='-5.4365759'/>
+#. <point lat='36.0034384' lon='-5.4353207'/><point lat='36.0036518' lon='-5.6888562'/><point lat='36.0405317' lon='-5.6899635'/>
+#. <point lat='36.0385595' lon='-5.8550600'/><point lat='36.1242077' lon='-5.8566821'/><point lat='36.1221487' lon='-5.9384817'/>
+#. <point lat='36.1655625' lon='-5.9400265'/><point lat='36.1645024' lon='-5.9983445'/><point lat='36.1780957' lon='-6.0357297'/>
+#. <point lat='36.2224132' lon='-6.0775178'/><point lat='36.2864561' lon='-6.1506113'/><point lat='36.3770075' lon='-6.2315410'/>
+#. <point lat='36.5310643' lon='-6.3358504'/><point lat='36.5816265' lon='-6.3214629'/><point lat='36.6234958' lon='-6.4041910'/>
+#. <point lat='36.7489673' lon='-6.4743301'/><point lat='36.7993866' lon='-6.4158808'/><point lat='36.9173818' lon='-6.4905160'/>
+#. <point lat='37.0194012' lon='-6.6298949'/><point lat='37.1083766' lon='-6.8744824'/><point lat='37.1850699' lon='-7.0426363'/>
+#. <point lat='37.1843535' lon='-7.2647434'/><point lat='37.1535419' lon='-7.3753473'/><point lat='37.1682196' lon='-7.4083160'/>
+#. <point lat='37.2118318' lon='-7.4202886'/><point lat='37.2350505' lon='-7.4249231'/><point lat='37.2451969' lon='-7.4380543'/>
+#. <point lat='37.3326142' lon='-7.4459717'/><point lat='37.3909382' lon='-7.4480958'/><point lat='37.4075829' lon='-7.4696271'/>
+#. <point lat='37.4530494' lon='-7.4647029'/><point lat='37.5164110' lon='-7.5019723'/><point lat='37.5229203' lon='-7.5191587'/>
+#. <point lat='37.5723727' lon='-7.5219588'/><point lat='37.6695835' lon='-7.4501271'/><point lat='37.7599222' lon='-7.4249019'/>
+#. <point lat='37.8399740' lon='-7.3166620'/><point lat='37.9889520' lon='-7.2683290'/><point lat='38.0155235' lon='-7.1536786'/>
+#. <point lat='38.0553626' lon='-7.1177098'/><point lat='38.0243785' lon='-7.0142997'/><point lat='38.1075633' lon='-6.9963153'/>
+#. <point lat='38.2012540' lon='-6.9614706'/><point lat='38.1570753' lon='-7.0806170'/><point lat='38.4402363' lon='-7.3402665'/>
+#. <point lat='38.7380741' lon='-7.2638329'/><point lat='38.8729667' lon='-7.0435243'/><point lat='38.9079620' lon='-7.0615086'/>
+#. <point lat='39.0198308' lon='-6.9693387'/><point lat='39.0887867' lon='-7.0008114'/><point lat='39.0957658' lon='-7.1536786'/>
+#. <point lat='39.1602899' lon='-7.1525545'/><point lat='39.1968854' lon='-7.2447245'/><point lat='39.2813308' lon='-7.2559647'/>
+#. <point lat='39.3535074' lon='-7.3368944'/><point lat='39.4559917' lon='-7.3279022'/><point lat='39.5886496' lon='-7.5144901'/>
+#. <point lat='39.6795427' lon='-7.5527069'/><point lat='39.6752171' lon='-7.0502684'/><point lat='39.8195433' lon='-6.9951913'/>
+#. <point lat='39.8790868' lon='-6.9221297'/><point lat='40.0229854' lon='-6.8861610'/><point lat='40.1347927' lon='-7.0412762'/>
+#. <point lat='40.2661460' lon='-7.0176717'/><point lat='40.3450071' lon='-6.8086034'/><point lat='40.4451649' lon='-6.8681766'/>
+#. <point lat='40.6066433' lon='-6.8535643'/><point lat='40.8757589' lon='-6.8378280'/><point lat='41.0370445' lon='-6.9536024'/>
+#. <point lat='41.0395879' lon='-6.8018592'/><point lat='41.1387060' lon='-6.7681385'/><point lat='41.2655616' lon='-6.6411239'/>
+#. <point lat='41.2630269' lon='-6.5624422'/><point lat='41.5791017' lon='-6.2173670'/><point lat='41.6446520' lon='-6.3162811'/>
+#. <point lat='41.6412921' lon='-6.5152332'/><point lat='41.6883151' lon='-6.5871707'/><point lat='41.8559743' lon='-6.5478299'/>
+#. <point lat='41.9112057' lon='-6.6298836'/><point lat='41.9404756' lon='-7.1334461'/><point lat='41.8718791' lon='-7.1682909'/>
+#. <point lat='41.7847727' lon='-7.4256922'/><point lat='41.8459271' lon='-7.9539833'/><point lat='41.7805819' lon='-8.1304550'/>
+#. <point lat='41.9078597' lon='-8.2518495'/><point lat='42.0348842' lon='-8.1293309'/><point lat='42.1008034' lon='-8.2484774'/>
+#. <point lat='42.0557521' lon='-8.3676239'/><point lat='42.0340493' lon='-8.6070409'/><point lat='41.8228891' lon='-8.8910646'/>
+#. </shape>
+#. </bounds>
+#. <attribution-text mandatory='true'>SIGPAC</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>GRAFCAN - Canary Islands</name>
+#: build/trans_wms.java:1007
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://idecan1.grafcan.es/ServicioWMS/OrtoUrb?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=OU&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='27.6221843' min-lon='-18.1779014' max-lat='29.4280698' max-lon='-13.3261713'>
+#. <shape>
+#. <point lat='28.8910589' lon='-17.9291733'/><point lat='28.7998146' lon='-18.0333424'/><point lat='28.7317767' lon='-18.0374275'/>
+#. <point lat='28.4322434' lon='-17.8781100'/><point lat='28.4178731' lon='-17.8311317'/><point lat='28.5632821' lon='-17.7269626'/>
+#. <point lat='28.6798232' lon='-17.7310476'/><point lat='28.7371497' lon='-17.6840694'/><point lat='28.8678081' lon='-17.7535155'/>
+#. <point lat='28.8606530' lon='-17.8576846'/><point lat='28.8910589' lon='-17.9291733'/>
+#. </shape>
+#. <shape>
+#. <point lat='27.7721138' lon='-18.0781762'/><point lat='27.7875098' lon='-18.1370743'/><point lat='27.7644149' lon='-18.1705392'/>
+#. <point lat='27.7069523' lon='-18.1779014'/><point lat='27.6879890' lon='-18.1578225'/><point lat='27.6790988' lon='-18.0580973'/>
+#. <point lat='27.6257423' lon='-18.0065614'/><point lat='27.6221843' lon='-17.9610492'/><point lat='27.7081374' lon='-17.9389624'/>
+#. <point lat='27.7193953' lon='-17.9075054'/><point lat='27.8046798' lon='-17.8619932'/><point lat='27.8407872' lon='-17.8727020'/>
+#. <point lat='27.8680077' lon='-17.9255764'/><point lat='27.8360525' lon='-18.0052228'/><point lat='27.8034958' lon='-18.0139237'/>
+#. <point lat='27.7721138' lon='-18.0781762'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.2399643' lon='-17.2687764'/><point lat='28.2193251' lon='-17.3340329'/><point lat='28.1536956' lon='-17.3633146'/>
+#. <point lat='28.0880258' lon='-17.3666611'/><point lat='28.0474233' lon='-17.3306864'/><point lat='28.0068054' lon='-17.2729595'/>
+#. <point lat='28.0053281' lon='-17.2001735'/><point lat='28.0289625' lon='-17.1441199'/><point lat='28.0835972' lon='-17.0780268'/>
+#. <point lat='28.1536956' lon='-17.0872296'/><point lat='28.2149019' lon='-17.1826044'/><point lat='28.2399643' lon='-17.2687764'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.3762297' lon='-16.9358012'/><point lat='28.3357366' lon='-16.9450040'/><point lat='27.9831662' lon='-16.7199529'/>
+#. <point lat='27.9831662' lon='-16.6254147'/><point lat='28.0164074' lon='-16.5275300'/><point lat='28.1463190' lon='-16.3995269'/>
+#. <point lat='28.3092236' lon='-16.3359437'/><point lat='28.3644515' lon='-16.3300873'/><point lat='28.5240820' lon='-16.1025263'/>
+#. <point lat='28.5814018' lon='-16.0983432'/><point lat='28.6254727' lon='-16.1426842'/><point lat='28.5960942' lon='-16.3392902'/>
+#. <point lat='28.5314325' lon='-16.4380115'/><point lat='28.4402508' lon='-16.5392427'/><point lat='28.4122923' lon='-16.8395897'/>
+#. <point lat='28.3762297' lon='-16.9358012'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.2058483' lon='-15.6883306'/><point lat='28.1643685' lon='-15.4739464'/><point lat='28.2104562' lon='-15.4242720'/>
+#. <point lat='28.1724353' lon='-15.3628326'/><point lat='28.0559841' lon='-15.3837481'/><point lat='27.9844367' lon='-15.3314593'/>
+#. <point lat='27.8042042' lon='-15.3576037'/><point lat='27.6977727' lon='-15.5915962'/><point lat='27.7336471' lon='-15.7000956'/>
+#. <point lat='27.8030479' lon='-15.7994443'/><point lat='27.9243925' lon='-15.8713415'/><point lat='28.0363710' lon='-15.8478115'/>
+#. <point lat='28.0894335' lon='-15.7471555'/><point lat='28.1839582' lon='-15.7314689'/><point lat='28.2058483' lon='-15.6883306'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.1344754' lon='-14.5088179'/><point lat='28.1344754' lon='-14.4107763'/><point lat='28.2427804' lon='-14.2486810'/>
+#. <point lat='28.3463737' lon='-14.2382232'/><point lat='28.7391056' lon='-14.0395256'/><point lat='28.7826519' lon='-13.8944241'/>
+#. <point lat='28.7769232' lon='-13.7859248'/><point lat='28.3843326' lon='-13.8212198'/><point lat='28.1909460' lon='-13.9153397'/>
+#. <point lat='28.1356282' lon='-14.1859344'/><point lat='28.0052882' lon='-14.3088131'/><point lat='28.0514443' lon='-14.5401912'/>
+#. <point lat='28.1344754' lon='-14.5088179'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.3772716' lon='-13.5524989'/><point lat='29.3682409' lon='-13.5086799'/><point lat='29.3872775' lon='-13.4795521'/>
+#. <point lat='29.4096331' lon='-13.4754312'/><point lat='29.4280698' lon='-13.5003013'/><point lat='29.4071183' lon='-13.5504986'/>
+#. <point lat='29.3772716' lon='-13.5524989'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.1610205' lon='-13.3976004'/><point lat='29.1215664' lon='-13.4281427'/><point lat='28.9908417' lon='-13.4417378'/>
+#. <point lat='28.9194675' lon='-13.5389950'/><point lat='28.8846777' lon='-13.7084109'/><point lat='28.8086488' lon='-13.7711575'/>
+#. <point lat='28.8352194' lon='-13.9008338'/><point lat='28.8892559' lon='-13.9071084'/><point lat='28.9368580' lon='-13.8579569'/>
+#. <point lat='29.0365684' lon='-13.8569111'/><point lat='29.1498834' lon='-13.6759918'/><point lat='29.1571898' lon='-13.5672310'/>
+#. <point lat='29.3507259' lon='-13.5542776'/><point lat='29.2180634' lon='-13.3998790'/><point lat='29.1610205' lon='-13.3976004'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.2866715' lon='-13.3379231'/><point lat='29.2743558' lon='-13.3503484'/><point lat='29.2653346' lon='-13.3385966'/>
+#. <point lat='29.2776514' lon='-13.3261713'/><point lat='29.2866715' lon='-13.3379231'/>
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Territorial&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>GRAFCAN OrtoExpress Urbana 2009</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>ITACyL - Castile and León</name>
+#: build/trans_wms.java:1076
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://orto.wms.itacyl.es/WMS?REQUEST=GetMap&SERVICE=WMS&VERSION=1.1.1&LAYERS=Ortofoto_CyL&SRS={proj}&FORMAT=image/jpeg&STYLES=Default&TRANSPARENT=TRUE&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Territorial&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>ITACyL</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>IDEIB - Balearic Islands</name>
+#: build/trans_wms.java:1085
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://ideib.caib.es/pub_ideib/public/IMATGES_AERIES/MapServer/WMSServer?VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=8&STYLES=default&FORMAT=image/png&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lon='1.1446656' min-lat='38.6237676' max-lon='4.3994771' max-lat='40.1276332'>
+#. <shape>
+#. <point lat='38.6248050' lon='1.6489275' /><point lat='38.7110984' lon='1.6479536' /><point lat='38.7100391' lon='1.5655859' />
+#. <point lat='38.8362172' lon='1.5646120' /><point lat='38.8351598' lon='1.4822737' /><point lat='38.9155737' lon='1.4814474' />
+#. <point lat='38.9165381' lon='1.5655563' /><point lat='38.9571694' lon='1.5647300' /><point lat='38.9581103' lon='1.6488389' />
+#. <point lat='38.9989241' lon='1.6480421' /><point lat='38.9999103' lon='1.7320625' /><point lat='39.0444420' lon='1.7313247' />
+#. <point lat='39.0435195' lon='1.6488765' /><point lat='39.1278411' lon='1.6480797' /><point lat='39.1267422' lon='1.3946905' />
+#. <point lat='39.0863458' lon='1.3956349' /><point lat='39.0850859' lon='1.2279187' /><point lat='39.0030754' lon='1.2288926' />
+#. <point lat='39.0016764' lon='1.1446656' /><point lat='38.8318955' lon='1.1456690' /><point lat='38.8332288' lon='1.3113193' />
+#. <point lat='38.7903874' lon='1.3122342' /><point lat='38.7916296' lon='1.3946905' /><point lat='38.7528829' lon='1.3954873' />
+#. <point lat='38.7517321' lon='1.3112013' /><point lat='38.6237676' lon='1.3122637' />
+#. </shape>
+#. <shape>
+#. <point lat='40.0856962' lon='3.8127693' /><point lat='40.0852552' lon='4.0622084' /><point lat='40.1276331' lon='4.0629289' />
+#. <point lat='40.1266966' lon='4.1493175' /><point lat='40.0859719' lon='4.1483808' /><point lat='40.0850347' lon='4.2326079' />
+#. <point lat='40.0442299' lon='4.2318874' /><point lat='40.0434025' lon='4.3159704' /><point lat='39.9193480' lon='4.3152499' />
+#. <point lat='39.9185191' lon='4.3994770' /><point lat='39.8322597' lon='4.3984683' /><point lat='39.8330343' lon='4.3160425' />
+#. <point lat='39.7905288' lon='4.3152499' /><point lat='39.7914146' lon='4.1452827' /><point lat='39.8324810' lon='4.1458591' />
+#. <point lat='39.8333109' lon='4.0620643' /><point lat='39.8741865' lon='4.0626407' /><point lat='39.8750159' lon='3.9789900' />
+#. <point lat='39.9158666' lon='3.9794223' /><point lat='39.9165850' lon='3.8121929' /><point lat='39.9576871' lon='3.8127693' />
+#. <point lat='39.9583498' lon='3.7289745' /><point lat='40.0438990' lon='3.7291907' /><point lat='40.0435129' lon='3.8121209' />
+#. </shape>
+#. <shape>
+#. <point lat='39.2497788' lon='3.1482712' /><point lat='39.2914976' lon='3.1483893' /><point lat='39.2914519' lon='3.2316129' />
+#. <point lat='39.3330546' lon='3.2317604' /><point lat='39.3329633' lon='3.3149545' /><point lat='39.4997870' lon='3.3152201' />
+#. <point lat='39.4994682' lon='3.3983256' /><point lat='39.5414021' lon='3.3985617' /><point lat='39.5410834' lon='3.4817263' />
+#. <point lat='39.7933578' lon='3.4818738' /><point lat='39.7934938' lon='3.1482712' /><point lat='39.8330968' lon='3.1484483' />
+#. <point lat='39.8329835' lon='3.2316424' /><point lat='40.0017256' lon='3.2318194' /><point lat='40.0018386' lon='3.1459103' />
+#. <point lat='39.9601389' lon='3.1457627' /><point lat='39.9600484' lon='2.8958559' /><point lat='39.9185496' lon='2.8958854' />
+#. <point lat='39.9184364' lon='2.8124552' /><point lat='39.8768443' lon='2.8125733' /><point lat='39.8767085' lon='2.7290251' />
+#. <point lat='39.8352724' lon='2.7291726' /><point lat='39.8350458' lon='2.6456834' /><point lat='39.7936526' lon='2.6458310' />
+#. <point lat='39.7934031' lon='2.5622533' /><point lat='39.7104055' lon='2.5624303' /><point lat='39.7100876' lon='2.4787641' />
+#. <point lat='39.6688237' lon='2.4790887' /><point lat='39.6684830' lon='2.3953929' /><point lat='39.6272169' lon='2.3956585' />
+#. <point lat='39.6268532' lon='2.2286802' /><point lat='39.5410379' lon='2.2291819' /><point lat='39.5414703' lon='2.3120513' />
+#. <point lat='39.4993771' lon='2.3124055' /><point lat='39.4996731' lon='2.4390410' /><point lat='39.4160716' lon='2.4393067' />
+#. <point lat='39.4164820' lon='2.5453134' /><point lat='39.4997870' lon='2.5450478' /><point lat='39.4999236' lon='2.6455949' />
+#. <point lat='39.4579647' lon='2.6457129' /><point lat='39.4582381' lon='2.7289660' /><point lat='39.3330317' lon='2.7290841' />
+#. <point lat='39.3331687' lon='2.9791385' /><point lat='39.2498017' lon='2.9791680' />
+#. </shape>
+#. <shape>
+#. <point lat='39.0832200' lon='2.9816461' /><point lat='39.2100713' lon='2.9815989' />
+#. <point lat='39.2100164' lon='2.8958255' /><point lat='39.0831650' lon='2.8957783' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Territorial&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>ideib.cat</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
 #. <!--only for Estonia-->
-#. <!--false;Estonia Basemap (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&-->
+#.
 #. <entry>
 #. <name>Estonia Basemap (Maaamet)</name>
-#: build/trans_wms.java:320
+#: build/trans_wms.java:1140
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&]]></url>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>EE</country-code>
 #. </entry>
-#. <!--false;Estonia Ortho (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&-->
+#.
 #. <entry>
 #. <name>Estonia Ortho (Maaamet)</name>
-#: build/trans_wms.java:327
+#: build/trans_wms.java:1147
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&]]></url>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS={proj}&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>EE</country-code>
 #. </entry>
-#. <!--false;Estonia Multi (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&-->
+#.
 #. <entry>
 #. <name>Estonia Multi (Maaamet)</name>
-#: build/trans_wms.java:334
+#: build/trans_wms.java:1154
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&]]></url>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>EE</country-code>
 #. </entry>
+#.
 #. <!--only for Denmark-->
-#. <!--false;Fugro (Denmark);tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2-->
+#.
 #. <entry>
 #. <name>Fugro (Denmark)</name>
-#: build/trans_wms.java:342
+#: build/trans_wms.java:1163
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>19</max-zoom>
 #. <bounds min-lat='54.46819' min-lon='8.01887' max-lat='57.8229' max-lon='15.30992'/>
-#. <max-zoom>19</max-zoom>
 #. <attribution-text mandatory='true'>Fugro Aerial Mapping</attribution-text>
 #. <attribution-url>http://wiki.openstreetmap.org/wiki/Fugro</attribution-url>
@@ -36495,35 +37466,51 @@
 #. <country-code>DK</country-code>
 #. </entry>
-#. <!--false;Stevns (Denmark);tms[20]:http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png;;55.23403,12.09144,55.43647,12.47712;Stevns Kommune-->
+#.
 #. <entry>
 #. <name>Stevns (Denmark)</name>
-#: build/trans_wms.java:354
+#: build/trans_wms.java:1175
 msgid "Stevns (Denmark)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://{switch:a,b,c}.tile.openstreetmap.dk/stevns/2009/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>20</max-zoom>
 #. <bounds min-lat='55.23403' min-lon='12.09144' max-lat='55.43647' max-lon='12.47712'/>
-#. <max-zoom>20</max-zoom>
 #. <attribution-text mandatory='true'>Stevns Kommune</attribution-text>
 #. <country-code>DK</country-code>
 #. </entry>
+#.
 #. <!--only for Phillipines-->
-#. <!--false;Pangasinan (Phillipines HiRes);tms:http://gravitystorm.dev.openstreetmap.org/imagery/philippines-->
+#.
 #. <entry>
-#. <name>Pangasinan (Phillipines HiRes)</name>
-#: build/trans_wms.java:365
-msgid "Pangasinan (Phillipines HiRes)"
+#. <name>Pangasinán/Bulacan (Phillipines HiRes)</name>
+#: build/trans_wms.java:1187
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://gravitystorm.dev.openstreetmap.org/imagery/philippines/{zoom}/{x}/{y}.png</url>
+#. <min-zoom>12</min-zoom>
+#. <max-zoom>19</max-zoom>
+#. <bounds min-lat='14.7025' min-lon='120.33659' max-lat='16.21853' max-lon='121.2699'>
+#. <shape>
+#. <point lat="15.985768" lon="120.336593"/><point lat="15.984000" lon="120.445995"/><point lat="15.974459" lon="120.446134"/>
+#. <point lat="15.974592" lon="120.476464"/><point lat="15.946832" lon="120.594247"/><point lat="16.090795" lon="120.598064"/>
+#. <point lat="16.197999" lon="120.596537"/><point lat="16.218527" lon="120.368537"/><point lat="16.042308" lon="120.347576"/>
+#. <point lat="15.985768" lon="120.336593"/>
+#. </shape>
+#. <shape>
+#. <point lat='15.3658' lon='120.8268' /><point lat='15.2602' lon='121.2684' />
+#. <point lat='14.7025' lon='121.2699' /><point lat='14.8423' lon='120.6950' />
+#. </shape>
+#. </bounds>
 #. <country-code>PH</country-code>
 #. </entry>
+#.
 #. <!--only for Russia-->
-#. <!--false;ScanEx IRS;scanex:irs;;;IRS-->
+#.
 #. <entry>
 #. <name>ScanEx IRS</name>
-#: build/trans_wms.java:373
+#: build/trans_wms.java:1210
 msgid "ScanEx IRS"
 msgstr ""
@@ -36535,9 +37522,10 @@
 #. <country-code>RU</country-code>
 #. </entry>
+#.
 #. <!--only for South Africa-->
-#. <!--false;South Africa Topo (OOC);tms[3,15]:http://grant.dev.openstreetmap.org/za-ooc-slippy;;16.30,-35,33.15,-22.1-->
+#.
 #. <entry>
 #. <name>South Africa Topo (OOC)</name>
-#: build/trans_wms.java:383
+#: build/trans_wms.java:1221
 msgid "South Africa Topo (OOC)"
 msgstr ""
@@ -38935,4 +39923,21 @@
 msgstr ""
 
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:103
+msgid "GPX Waypoints Enum"
+msgstr ""
+
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:104
+msgid "Waypoint Enumerator"
+msgstr ""
+
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:144
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:145
+msgid "Next GPX Waypoint"
+msgstr ""
+
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:144
+msgid "Select to the next Waypoint in List"
+msgstr ""
+
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:124
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:148
@@ -39518,18 +40523,18 @@
 msgstr ""
 
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:52
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:46
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:47
 msgid "Import..."
 msgstr ""
 
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:52
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:46
 msgid "Import vector graphics."
 msgstr ""
 
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:84
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:78
 msgid "SVG Drawings (*.svg)"
 msgstr ""
 
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:139
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:133
 msgid "Importing..."
 msgstr ""
@@ -40199,16 +41204,15 @@
 msgstr ""
 
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:55
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:54
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:57
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
 msgid "Merge overlap"
 msgstr ""
 
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:55
 msgid "Merge overlap of ways."
 msgstr ""
 
-#. Commit
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:264
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:243
 msgid "Merge Overlap (combine)"
 msgstr ""
@@ -40262,80 +41266,114 @@
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:68
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:68
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:68
 msgid "Native password manager plugin"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:207
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207
 msgid "No native password manager could be found!"
 msgstr ""
 
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
-msgid ""
-"Depending on your Operating System / Distribution, you may have to create a "
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
+msgid ""
+"Depending on your Operating Stystem / Distribution, you may have to create a "
 "default keyring / wallet first."
 msgstr ""
 
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
-msgid "No thanks, use JOSM''s plain text preferences storage"
-msgstr ""
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
-msgid ""
-"Found sensitive data that is still saved in JOSM''s preference file (plain "
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
+msgid "No thanks, use JOSM's plain text preferences storage"
+msgstr ""
+
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
+msgid ""
+"Found sensitive data that is still saved in JOSM's preference file (plain "
 "text)."
 msgstr ""
 
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
-msgid "Transfer to password manager and remove from preference file"
-msgstr ""
-
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
+msgid "Erase and transfer to password manager"
+msgstr ""
+
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
 msgid "No, just keep it"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
 msgid "Close the dialog and discard all changes"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
 msgid "Proceed and go to the next page"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
 msgid "Finish"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
 msgid "Confirm the setup and close this dialog"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
 msgid "JOSM/OSM API/Username"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
 msgid "JOSM/OSM API/Password"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144
 msgid "JOSM/Proxy/Username"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145
 msgid "JOSM/Proxy/Password"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
 msgid "JOSM/OAuth/OSM API/Key"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
 msgid "JOSM/OAuth/OSM API/Secret"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
 msgid "Native Password Manager Plugin"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
 #, java-format
@@ -40343,35 +41381,49 @@
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216
 msgid "username"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219
 msgid "password"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
 msgid "proxy username"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
 msgid "proxy password"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
 msgid "oauth key"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
 msgid "oauth secret"
 msgstr ""
 
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
-#, java-format
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
 msgid ""
 "<br><strong>Warning:</strong> There may be sensitive data left in your "
-"preference file. ({0})"
-msgstr ""
-
+"preference file. ("
+msgstr ""
+
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:245
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:245
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:242
 #, java-format
@@ -40379,8 +41431,16 @@
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:16
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:16
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:16
 msgid "Plain text, JOSM default"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:22
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:28
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:33
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:22
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:28
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:33
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:22
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:28
@@ -40390,11 +41450,42 @@
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:38
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:38
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:38
 msgid "Encrypt data with Windows logon credentials"
 msgstr ""
 
+#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:42
+#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:42
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:42
 #, java-format
 msgid "The native password manager plugin detected {0} on your system."
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
+msgid ""
+"Depending on your Operating System / Distribution, you may have to create a "
+"default keyring / wallet first."
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
+msgid "No thanks, use JOSM''s plain text preferences storage"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321
+msgid ""
+"Found sensitive data that is still saved in JOSM''s preference file (plain "
+"text)."
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
+msgid "Transfer to password manager and remove from preference file"
+msgstr ""
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
+#, java-format
+msgid ""
+"<br><strong>Warning:</strong> There may be sensitive data left in your "
+"preference file. ({0})"
 msgstr ""
 
@@ -41781,4 +42872,12 @@
 msgstr ""
 
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
+msgid "Found XML element <nd> not as direct child of element <way>."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
+msgid "Found XML element <member> not as direct child of element <relation>."
+msgstr ""
+
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:29
 msgid "Image files"
@@ -41954,4 +43053,24 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr ""
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42012,9 +43131,4 @@
 #, java-format
 msgid "Error while exporting {0}: {1}"
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
-msgid "Way: "
 msgstr ""
 
@@ -42699,9 +43813,9 @@
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:182
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:183
 msgid "Add turn"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:233
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:234
 msgid "Delete lane."
 msgstr ""
@@ -42796,17 +43910,17 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:99
 msgid "Clear the selected roles or delete the selected members"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:125
 msgid "Insert new relation members from object in the clipboard"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:166
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:164
 msgid "Move the selected relation members down by one position"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:193
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:191
 msgid "Move the selected relation members up by one position"
 msgstr ""
@@ -43527,4 +44641,20 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:30
+msgid "Select custom URL"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:63
+msgid "Please select one of custom URLs (configured in Preferences)"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:66
+msgid "Ask every time"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:69
+msgid "Configure custom URL"
+msgstr ""
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:33
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:46
@@ -43546,25 +44676,11 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
-#, fuzzy
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:37
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:39
 msgid "Open custom URL"
-msgstr "إفتح URL"
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:38
 msgid "Opens specified URL browser"
-msgstr ""
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:141
-msgid ""
-"You can open custom URL for <b>one</b> selected object<br/> <b>&#123;"
-"key&#125;</b> is replaced with the tag walue<br/> <b>&#123;#id&#125;</b> is "
-"replaced with the element ID<br/> <b>&#123;#type&#125;</b> is replaced with "
-"\"node\",\"way\" or \"relation\" <br/> <b>&#123;#lat&#125; , &#123;#lon&#125;"
-"</b> is replaced with element latitude/longitude"
-msgstr ""
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:151
-msgid "Configure custom URL"
 msgstr ""
 
@@ -43624,6 +44740,36 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:51
 msgid "More tools"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:52
+msgid "Utilsplugin2 settings [TESTING]"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:53
+msgid "Here you can change some preferences of Utilsplugin2 functions"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:74
+msgid "Save to file"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:81
+msgid "Load from file"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:91
+msgid ""
+"Please edit custom URLs and select one row to use with the tool<br/> "
+"<b>&#123;key&#125;</b> is replaced with the tag value<br/> <b>&#123;#id&#125;"
+"</b> is replaced with the element ID<br/> <b>&#123;#type&#125;</b> is "
+"replaced with \"node\",\"way\" or \"relation\" <br/> <b>&#123;#lat&#125; , "
+"&#123;#lon&#125;</b> is replaced with map center latitude/longitude <br/> "
+"Your can manually load settings from file <b>customurl.txt</b> in JOSM folder"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:98
+msgid "Custom URL configuration"
 msgstr ""
 
@@ -43741,5 +44887,5 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:48
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:44
 msgid "Please select some ways to find connected and intersecting ways!"
 msgstr ""
@@ -43753,5 +44899,5 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:48
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:46
 msgid "Please select some ways to find all connected and intersecting ways!"
 msgstr ""
@@ -43766,12 +44912,26 @@
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:44
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:259
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:265
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:189
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:215
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:195
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:221
 #, java-format
 msgid "Too many ways are added: {0}!"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:29
+msgid "All inside [testing]"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:29
+msgid "Select all inside selected polygons"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:63
+msgid ""
+"Nothing found. Please select some closed ways or multipolygons to find all "
+"primitives inside them!"
 msgstr ""
 
@@ -44105,2 +45265,11 @@
 msgid "Drive a race car on this layer"
 msgstr ""
+
+#~ msgid "NPE Maps"
+#~ msgstr "خرائط NPE"
+
+#~ msgid "Info about Element"
+#~ msgstr "معلومات حول العنصر"
+
+#~ msgid "Object history"
+#~ msgstr "خط الغرض الزمني"
