Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 26721)
+++ /applications/editors/josm/i18n/po/et.po	(revision 26722)
@@ -4,28 +4,10 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
-#. <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"
-"PO-Revision-Date: 2011-09-02 10:08+0000\n"
+"POT-Creation-Date: 2011-09-27 19:09+0200\n"
+"PO-Revision-Date: 2011-09-16 13:21+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -35,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-09-02 19:09+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:44+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -44,6 +26,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
@@ -68,8 +50,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
@@ -81,7 +63,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
@@ -95,8 +77,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
@@ -108,5 +91,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
@@ -116,6 +98,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
@@ -129,10 +111,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"
@@ -168,14 +151,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
@@ -186,7 +169,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
@@ -202,6 +185,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
@@ -211,5 +194,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
@@ -389,8 +372,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
@@ -404,6 +387,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
@@ -415,6 +398,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
@@ -429,6 +412,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
@@ -450,7 +433,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
@@ -467,5 +452,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 "Katkesta"
@@ -476,4 +461,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 "Palun vali vähemalt üks juba üles laaditud sõlm, joon või relatsioon."
@@ -532,4 +518,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
@@ -578,5 +565,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
@@ -594,4 +581,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
@@ -612,5 +600,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
@@ -628,4 +616,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
@@ -657,8 +646,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
@@ -687,5 +676,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 "andmed"
@@ -754,5 +743,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 "Sule avatud muudatused"
@@ -772,6 +761,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
@@ -851,9 +840,10 @@
 msgstr "Palun vali kopeerimiseks mõni objekt."
 
-#: ../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 "Kopeeri koordinaadid"
 
-#: ../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 "Kopeeri valitud sõlmede koordinaadid lõikepuhvrisse."
@@ -910,13 +900,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
@@ -928,5 +918,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
@@ -946,14 +936,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 "Kirjuta üle"
 
 #: ../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 "Fail on juba olemas. Kas kirjutada see üle?"
@@ -996,5 +986,5 @@
 msgctxt "osm object types"
 msgid "mixed"
-msgstr ""
+msgstr "segamets"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:98
@@ -1064,6 +1054,6 @@
 msgid "Object could not be downloaded"
 msgid_plural "Some objects could not be downloaded"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Objekti ei saa alla laadida"
+msgstr[1] "Osasid objekte ei saa alla laadida"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:206
@@ -1071,6 +1061,6 @@
 msgid "One object could not be downloaded.<br>"
 msgid_plural "{0} objects could not be downloaded.<br>"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ühte objekti ei saa alla laadida.<br>"
+msgstr[1] "{0} objekti ei saa alla laadida.<br>"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:210
@@ -1079,4 +1069,6 @@
 "does not know an object with the requested id."
 msgstr ""
+"Server vastas koodiga 404.<br>Tavaliselt tähendab see seda, et server ei "
+"tunne nõutud identifikaatoriga objekti."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:212
@@ -1130,4 +1122,6 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr ""
+"Lõikepuhvrisse kopeerimise ja kohese kleepimise tagajärjel tekkinud "
+"topeltvalik."
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
@@ -1140,5 +1134,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}"
@@ -1212,12 +1206,26 @@
 msgstr "Ekspordi GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Objekti ajalugu"
-
-#: ../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 "Ajalugu"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide ajaloo kohta."
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:46
@@ -1262,5 +1270,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 "OK"
@@ -1287,12 +1295,24 @@
 msgstr "Nihke järjehoidja on juba olemas. Kas kirjutan üle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20
-msgid "Info about Element"
-msgstr "Info elemendi kohta"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta."
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
@@ -1312,6 +1332,9 @@
 msgstr "Üks valitud teedest ei ole suletud ning seega ei saa seda ühendada."
 
-#: ../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."
@@ -1321,21 +1344,24 @@
 msgstr[1] "Valitud teedel on sõlmesid väljaspool alla laetud andmete ala."
 
-#: ../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 "See võib põhjustada sõlmede soovimatut kustutamist."
 
-#: ../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 "Kas sa tõesti soovid jätkata?"
 
-#: ../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 "Kui Sa pole kindel, palun katkesta tegevus"
 
-#: ../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 "Lõikumist ei leitud. Mitte midagi ei muudetud."
@@ -1343,33 +1369,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 "Tühistan muutused"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr "Eemaldatud topeltsõlmed"
 
-#: ../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 "Sõlm lisatud kõikidesse lõikumiskohtadesse."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr "Moodusta uued polügoonid."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr "Kustuta relatsioonid"
 
-#: ../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 "Kustuta sisemise liitala liikmeks mitteolevad teed"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr "Kattuvate alade ühendamine"
 
-#: ../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 "
@@ -1379,23 +1405,23 @@
 "tekkinud vigu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "Paranda sildivastuolud"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr "Lahuta teed osadeks"
 
-#: ../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 "
@@ -1403,19 +1429,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 "Element relatsioonidest eemaldatud"
 
 #. 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 "Eemalda sildid sisemistelt teedelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr "Alade ühendamise funktsioon"
@@ -1500,5 +1526,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
-msgstr ""
+msgstr "Korrigeeritud aluskaardi allalaadimine erinevatest teenustest"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
@@ -1623,4 +1649,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
@@ -1640,8 +1667,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 "Üles"
@@ -1661,4 +1689,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
@@ -1678,8 +1707,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 "Alla"
@@ -1713,5 +1743,5 @@
 #, java-format
 msgid "Moves Objects {0}"
-msgstr "Liiguta objektid {0}"
+msgstr "Liigutab objektid {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
@@ -1755,25 +1785,36 @@
 msgid "Cannot open {0} file with the file importer ''{1}''."
 msgid_plural "Cannot open {0} files with the file importer ''{1}''."
+msgstr[0] "Ei suuda avada {0} faili importijaga ''{1}''."
+msgstr[1] "Ei suuda avada {0} faili importijaga ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156
+#, java-format
+msgid ""
+"Cannot open {0} file because file does not exist or no suitable file "
+"importer is available."
+msgid_plural ""
+"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:156
-#, java-format
-msgid "Cannot open {0} file because no suitable file importer is available."
-msgid_plural ""
-"Cannot open {0} files because no suitable file importer is available."
-msgstr[0] ""
-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 "Ava fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1782,5 +1823,5 @@
 msgstr[1] "Avan {0} faili..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1807,5 +1848,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download Location"
-msgstr ""
+msgstr "Allalaadimise koht"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
@@ -1902,7 +1943,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
@@ -2072,5 +2113,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 "Salvesta"
@@ -2086,30 +2127,30 @@
 msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
 
-#: ../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 "Eksportijat ei leitud. Mitte midagi ei salvestatud."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Tühi dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "Salvesta ikkagi."
 
-#: ../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 "Dokumendis ei ole andmeid."
 
 #. 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 "Vastuolud"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "Lahenda vastuolud ja salvesta."
 
-#: ../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 "
@@ -2119,13 +2160,13 @@
 "tagasi. Jätkame?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "Salvesta OSM fail."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "Salvesta GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "Salvesta kiht"
@@ -2177,5 +2218,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
@@ -2185,55 +2226,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 "Sulge"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Lihtsusta tee"
 
-#: ../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 "Kustuta joonelt mittevajalikud  sõlmed."
 
-#: ../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 "Jah, kustuta sõlmed"
-
-#: ../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 "Kustuta sõlmed väljaspool allalaetud andmete ulatust"
-
-#: ../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 "Ei, katkesta"
-
-#: ../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 "Katkesta operatsioon"
-
-#: ../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 "Kas soovid neid kustutada sellegipoolest?"
-
-#: ../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 "Kas kustutan sõlmed väljaspool andmete ala?"
-
-#: ../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 "Palun vali lihtsustamiseks vähemalt üks tee."
 
-#: ../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
@@ -2244,10 +2252,16 @@
 msgstr "Jah"
 
-#: ../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 "Lihtsusta kõik valitud teed"
 
-#: ../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 "Katkesta operatsioon"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2257,10 +2271,10 @@
 "Valik sisaldab {0} teed. Kas oled kindel, et soovid neid kõiki lihtsustada?"
 
-#: ../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 "Kas lihtsustada teed?"
 
-#: ../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
@@ -2270,5 +2284,5 @@
 msgstr[1] "Lihtsustada {0} teed"
 
-#: ../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)"
@@ -2331,5 +2345,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 "
@@ -2338,5 +2352,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 "
@@ -2372,38 +2386,38 @@
 msgstr "Kahekordista sõlmed, mida kasutavad mitu teed."
 
-#: ../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 "See on üksik sõlm."
 
-#: ../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 "Ükski neist sõlmedest ei ole millegi küljes."
 
-#: ../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 "Ükski selle tee sõlmedest ei ole millegi muu küljes."
 
-#: ../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 "Praegust valikut ei saa liimist lahtivõtmiseks kasutada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "Vali üks järgnevaist:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* üks sildiga sõlm või"
 
-#: ../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 "* üks sõlm, mis on kasutusel rohkem kui ühes tees või"
 
-#: ../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 ""
 "* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest"
 
-#: ../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"
@@ -2412,10 +2426,10 @@
 "teedest"
 
-#: ../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 "* Üks joon ja vähemalt üks selle joone sõlm, mida kasutab mitu joont."
 
-#: ../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"
@@ -2428,14 +2442,14 @@
 "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr "Lahtisulatatud sõlm"
 
-#: ../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 "Kordista {0} sõlmeks"
 
-#: ../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"
@@ -2443,4 +2457,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
@@ -2462,5 +2493,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
-msgstr "Tühista kõigi objektide valikud"
+msgstr "Tühista kõikide objektide valikud"
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -2536,14 +2567,14 @@
 msgstr "Tühi valik"
 
-#: ../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 "Laadi andmed üles"
 
-#: ../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 "Laadi kõik aktiivses andmekihis tehtud muudatused OSMi serverisse."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2554,5 +2585,5 @@
 "vaja need lahendada. </html>"
 
-#: ../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
@@ -2560,5 +2591,5 @@
 msgstr "Pole muudatusi, mida üles laadida."
 
-#: ../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 "Midagi pole üles laadida. Hangi esmalt andmeid."
@@ -2596,18 +2627,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:122
 msgid "Validating"
-msgstr "Järelkontrollin"
+msgstr "Järelkontrollimine"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:166
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
-msgstr ""
+msgstr "Kontroll {0}/{1}: Käivitan {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:175
 msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Uuendan ignoreeritud vigu ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21
 msgid "Viewport Following"
-msgstr ""
+msgstr "Vaateava järgimine"
 
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:23
@@ -2617,5 +2648,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24
 msgid "Toggle Viewport Following"
-msgstr ""
+msgstr "Lülita vaateava järgimist"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
@@ -3031,8 +3062,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
@@ -3399,5 +3430,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 "Otsi"
@@ -3577,5 +3608,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
 msgid "... refers to relation"
-msgstr ""
+msgstr "... viitab relatsioonile"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
@@ -3619,5 +3650,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 "Muu"
@@ -3764,25 +3795,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"
@@ -3791,5 +3822,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"
@@ -3798,5 +3829,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"
@@ -3805,5 +3836,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"
@@ -3812,13 +3843,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."
@@ -3827,14 +3860,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 "
@@ -4048,4 +4072,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}''"
@@ -4053,19 +4078,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 ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4074,5 +4100,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4081,5 +4107,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4088,5 +4114,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4095,5 +4121,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4101,5 +4127,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4108,5 +4134,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4115,5 +4141,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4122,5 +4148,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4129,5 +4155,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}"
@@ -4201,20 +4227,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"
@@ -4231,5 +4257,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}."
@@ -4237,5 +4263,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}."
@@ -4253,5 +4279,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 ""
@@ -4259,5 +4285,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 ""
@@ -4326,5 +4352,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 "
@@ -4332,5 +4358,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 ""
@@ -4341,5 +4367,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"
@@ -4362,6 +4388,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"
@@ -4704,5 +4730,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 ""
@@ -4729,4 +4755,9 @@
 #, java-format
 msgid "Running test {0}"
+msgstr "Jooksev test: {0}"
+
+#: ../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 ""
 
@@ -4741,5 +4772,5 @@
 msgid_plural "objects"
 msgstr[0] "objekt"
-msgstr[1] "objektid"
+msgstr[1] "objekti"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java:45
@@ -4781,71 +4812,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 ""
@@ -4867,5 +4925,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:168
 msgid "Relations with same members"
-msgstr ""
+msgstr "Relatsioonid samade liikmetega"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:251
@@ -4908,54 +4966,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 "Liitala"
 
-#: ../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 "See test kontrollib liitalade korrektsust"
 
-#: ../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 "Liitalal pole välist teed"
 
-#: ../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 "Liitalal pole stiili"
 
-#: ../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 "Liitala pole suletud"
 
-#: ../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 "Liitala sisemine tee on väljaspool"
 
-#: ../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 "Liitala teede ristumine"
 
-#: ../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 ""
@@ -4989,4 +5047,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."
@@ -4999,29 +5062,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103
-msgid "Overlapping areas"
-msgstr "Kattuvad alad"
-
-#: ../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 "Kattuvad maanteed (aladega)"
 
-#: ../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 "Kattuvad raudteed (alaga)"
 
-#: ../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 "Kattuvad maanteed"
 
-#: ../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 "Kattuvad raudteed"
 
-#: ../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 ""
@@ -5222,7 +5281,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
@@ -5243,7 +5302,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
@@ -5269,5 +5328,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."
@@ -5294,5 +5353,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:662
 msgid "Data sources"
-msgstr ""
+msgstr "Andmeallikad"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:683
@@ -5427,48 +5486,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 ""
 
-#: ../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}"
@@ -5516,7 +5575,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"
@@ -5528,10 +5587,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 ""
@@ -5660,7 +5719,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}]"
@@ -5696,14 +5755,15 @@
 msgstr "Ära seda teadet rohkem näita (valik jäetakse meelde)"
 
-#: ../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}"
@@ -5712,6 +5772,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}"
@@ -5719,12 +5779,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 ""
@@ -5732,17 +5792,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 "Raudtee"
 
-#: ../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 ""
@@ -5751,8 +5811,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
@@ -5763,17 +5823,17 @@
 msgstr[1] "{0} punkti"
 
-#: ../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"
 msgid_plural "{0} members"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+msgstr[0] "{0} liige"
+msgstr[1] "{0} liiget"
+
+#: ../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
@@ -5879,5 +5939,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 "Aluskaart"
@@ -6106,5 +6166,5 @@
 msgid ""
 "It looks like JOSM crashed last time. Would you like to restore the data?"
-msgstr ""
+msgstr "Tundub, et JOSM jooksis eelmisel korral kokku. Kas taastan andmed?"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:318
@@ -6113,5 +6173,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"
@@ -6119,10 +6179,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 "Vaade"
 
-#: ../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
@@ -6131,5 +6191,5 @@
 msgstr "Tööriistad"
 
-#: ../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
@@ -6137,5 +6197,5 @@
 msgstr "Eelseaded"
 
-#: ../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
@@ -6146,5 +6206,5 @@
 msgstr "Menüü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Heli"
@@ -6181,5 +6241,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"
@@ -6187,5 +6247,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"
@@ -6336,5 +6396,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
@@ -6517,5 +6577,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
@@ -6525,5 +6585,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"
@@ -6533,5 +6593,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 "Liikmed"
@@ -6755,5 +6815,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
@@ -6881,4 +6941,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 ""
@@ -6948,6 +7009,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
@@ -6969,6 +7030,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
@@ -7078,5 +7139,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"
@@ -7159,5 +7220,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
@@ -7169,5 +7230,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
@@ -7299,9 +7360,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 "Ainult valitud objektid"
 
-#: ../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."
@@ -7310,18 +7371,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 "Muutustekogumid"
 
-#: ../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
@@ -7329,23 +7390,23 @@
 msgstr "Laadi alla"
 
-#: ../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 "Suleb valitud avatud muutustekogumid"
 
-#: ../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 "Näita infot"
 
-#: ../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
@@ -7353,5 +7414,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 ""
@@ -7370,12 +7431,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
@@ -7422,5 +7483,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
@@ -7597,19 +7658,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 "Ajalugu"
-
-#: ../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 "Näita kõigi valitud objektide ajalugu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+msgstr "Näita kõikide valitud objektide ajalugu."
+
+#: ../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
@@ -7619,10 +7674,10 @@
 msgstr "Lae uuesti"
 
-#: ../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 "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
 
 #. 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
@@ -7634,149 +7689,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 "Objekti põhjalikum info"
 
-#: ../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 ""
@@ -7786,5 +7832,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 ""
@@ -7793,5 +7839,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 ""
@@ -7801,5 +7847,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -7808,22 +7854,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 ""
@@ -7841,5 +7887,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
@@ -7851,10 +7897,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
@@ -7931,5 +7977,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 "Näita/Peida"
@@ -7948,5 +7994,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 ""
@@ -7980,9 +8026,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 "Liiguta valitud kiht ühe rea võrra üles."
 
-#: ../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 "Liiguta valitud kiht ühe rea võrra alla."
@@ -8055,5 +8101,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"
@@ -8096,24 +8142,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 "Relatsioonid"
 
-#: ../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 "Ava kõikide seoste nimekiri"
 
-#: ../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 "Ava valitud relatsioon redaktoris."
 
-#: ../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 "Kustuta valitud seos"
 
-#: ../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
@@ -8122,5 +8168,5 @@
 msgstr "Loo uus relatsioon"
 
-#: ../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
@@ -8128,133 +8174,125 @@
 msgstr "Tee sellest relatsioonist koopia ja ava see redaktoriaknas."
 
-#: ../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 "Relatsioone: {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 "Praegune valik"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "Ava valiku nimekirja aken."
-
-#: ../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 "Suurenda valikule"
-
-#: ../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 "Suurenda valitud elementidele"
-
-#: ../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 "Valik"
 
-#: ../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 "Ava valiku nimekirja aken."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+msgid "Current Selection"
+msgstr "Praegune valik"
+
+#: ../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 "Suurenda valikule"
+
+#: ../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 "Suurenda valitud elementidele"
+
+#: ../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 "Valik: Relatsioonid:{0} / Teed:{1} / Punktid:{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 "Valik: {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 "Vaata andmeid"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
@@ -8338,11 +8376,14 @@
 
 #: ../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 "Ava järelkontrolli aken."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
 msgid "Validation results"
 msgstr "Järelkontrolli tulemused"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
-msgid "Open the validation window."
-msgstr "Ava järelkontrolli aken."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -8689,4 +8730,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" />
@@ -8742,8 +8788,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" />
@@ -9528,5 +9570,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
@@ -9537,179 +9579,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
@@ -10128,9 +10171,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 "Lisa seaded"
 
-#: ../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."
@@ -10139,14 +10182,14 @@
 msgstr[1] "Muudetakse kuni {0} objekti."
 
-#: ../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 "Puuduv väärtus kustutab sildi."
 
-#: ../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
@@ -10158,5 +10201,5 @@
 msgstr "<erinev>"
 
-#: ../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?"
@@ -10164,13 +10207,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 ""
@@ -10179,5 +10222,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
@@ -10187,5 +10230,5 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../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."
@@ -10194,31 +10237,31 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../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 "Palun vali võti"
 
-#: ../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 "Palun vali väärtus"
 
-#: ../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 "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../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 "Seaded/Liikmelisus"
 
-#: ../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 "Valitud objektide seaded"
 
 #. 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"
@@ -10227,63 +10270,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 "Seaded: {0} / Liikmelisus: {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 "Seaded / Liikmelisus"
 
-#: ../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 "Muuda seost"
 
-#: ../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 "Tõesti soovid kustutada valikut seosest {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 "Kustuta valitud võti kõkides objektides"
 
-#: ../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 "Kustuda seadeid"
 
-#: ../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 "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../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 "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../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 "Abi siltide kasutamise kohta saab OSMi vikist (F1)"
 
-#: ../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 ""
 
@@ -10689,5 +10756,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:29
 msgid "Refers to"
-msgstr ""
+msgstr "Viitatav objekt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
@@ -10769,57 +10836,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 "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "Clear textarea"
 msgstr "Tühjenda tekstiala"
 
-#: ../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 "
@@ -10828,10 +10895,10 @@
 "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "Ümbritsev kast"
 
-#: ../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
@@ -10840,15 +10907,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"
@@ -10858,5 +10925,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
 msgid "Data Sources and Types:"
-msgstr ""
+msgstr "Andmeallikad ja  -tüübid:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
@@ -10926,13 +10993,4 @@
 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 ""
-
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102
 msgid "Choose the server for searching:"
@@ -10949,5 +11007,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:149
 msgid "Areas around places"
-msgstr ""
+msgstr "Alad asulate ümber"
 
 #. SAXException does not chain correctly
@@ -10979,7 +11037,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"
@@ -10995,12 +11058,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
@@ -11024,5 +11088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:180
 msgid "JOSM Help Browser"
-msgstr ""
+msgstr "JOSM abiinfo lehitseja"
 
 #. i18n: do not translate "warning-header" and "warning-body"
@@ -11083,4 +11147,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"
@@ -11095,5 +11161,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:485
 msgid "Go to the JOSM help home page"
-msgstr ""
+msgstr "Mine JOSM abiinfo kodulehele"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:516
@@ -11118,5 +11184,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 ""
@@ -11141,10 +11207,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 ""
@@ -11152,5 +11218,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 ""
@@ -11158,9 +11224,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 ""
@@ -11242,13 +11308,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}"
@@ -11731,5 +11797,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:325
 msgid "Exit JOSM without saving. Unsaved changes are lost."
-msgstr "Välju JOSMist muudatusi salvestamata. Muudatused lähevad kaotsi."
+msgstr ""
+"Välju JOSMist muudatusi salvestamata. Salvestamata muudatused lähevad kaotsi."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:330
@@ -11748,4 +11815,6 @@
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
+"Välju JOSMist muudatusi salvestades. Salvestamata muudatused laaditakse üles "
+"või salvestatakse."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:362
@@ -11817,5 +11886,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
@@ -11827,11 +11896,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 ""
@@ -11851,5 +11920,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 "Laadi üles"
@@ -11872,5 +11941,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
@@ -11883,5 +11952,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 ""
@@ -11900,30 +11969,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 "Lae muudatused üles"
 
-#: ../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 "
@@ -11934,33 +12003,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}"
@@ -12053,5 +12122,5 @@
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr ""
+msgstr "Uploading data for layer ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:78
@@ -12118,6 +12187,6 @@
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objekti üleslaadimine..."
+msgstr[1] "{0} objekti üleslaadimine..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
@@ -12312,5 +12381,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
@@ -12669,5 +12738,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 ""
@@ -12677,65 +12746,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 ""
@@ -12750,103 +12819,77 @@
 msgstr "Järelkontrolllivigu ei ole"
 
-#: ../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 "Viga faili laadimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:735
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
 msgid "Automatic downloading"
 msgstr "Automaatne allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:827
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
 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}"
@@ -13096,5 +13139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
-msgstr ""
+msgstr "Käivitan kataloogi skaneerimise"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
@@ -13212,5 +13255,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"
@@ -13407,4 +13453,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 ""
@@ -13550,4 +13597,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"
@@ -13625,8 +13674,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 ""
 
@@ -13978,26 +14023,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 "Nimeta aluskaart"
 
-#: ../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"
@@ -14005,49 +14050,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 "Aluskaardi URL"
 
-#: ../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 ""
@@ -14255,5 +14299,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}"
@@ -14389,5 +14433,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
@@ -14455,5 +14499,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 "Auto"
@@ -14479,14 +14523,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 "Jalgratas"
@@ -14525,13 +14569,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 ""
@@ -14676,113 +14720,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 "Aluskaardi eelistused"
 
-#: ../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 "Aluskaardi pakkujad"
 
-#: ../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
@@ -14793,55 +14841,55 @@
 msgstr "Uus"
 
-#: ../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 "Lisa aluskaardi URL"
 
-#: ../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 "Aluskaardi URL (Vaikimisi)"
 
-#: ../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 "Idasuund"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Northing"
 msgstr ""
@@ -14950,5 +14998,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244
 msgid "JOSM Internal Style"
-msgstr ""
+msgstr "JOSM sisseehitatud stiil"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245
@@ -15024,5 +15072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311
 msgid "Please restart JOSM to activate the downloaded plugins."
-msgstr ""
+msgstr "Allalaetud pluginate aktiveerimiseks palun taaskäivita JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -15031,4 +15079,6 @@
 "versions."
 msgstr ""
+"Kõik paigaldatud pluginad on värsked. JOSM ei pea uuemaid versioone alla "
+"laadima."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
@@ -15047,5 +15097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
 msgid "Add JOSM Plugin description URL."
-msgstr ""
+msgstr "Lisa JOSM plugina kirjelduse URL."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -15060,9 +15110,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:492
 msgid "Edit JOSM Plugin description URL."
-msgstr ""
+msgstr "Muuda JOSM plugina kirjelduse URLi."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:493
 msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "JOSM plugina kirjelduse URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:48
@@ -15337,4 +15387,6 @@
 "JOSM."
 msgstr ""
+"JOSM kuulab alati kohaliku arvuti porti 8111. Seda ei saa muuta, sest "
+"sellele viitavad JOSMiga suhtlevad välised rakendused."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
@@ -15421,7 +15473,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 ""
@@ -15974,5 +16028,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 ""
@@ -15981,5 +16035,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 ""
@@ -16019,28 +16073,28 @@
 msgstr "Valikulised tunnused:"
 
-#: ../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 "Kasuta eelseadet ''{0}'' grupist ''{1}''"
 
-#: ../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 "Kasuta eelseadet \"{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 "Tundmatu tüüp: {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
@@ -16050,15 +16104,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../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 "Viga sõelumisel {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 "Elemente tüübist {0} toetatakse."
 
-#: ../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
@@ -16068,22 +16122,22 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "Valik ei sobi!"
 
-#: ../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 "Rakenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
 msgid "New relation"
 msgstr "Uus relatsioon"
 
-#: ../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"
@@ -16145,4 +16199,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 ""
 
@@ -16494,5 +16583,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:95
 msgid "Downloading OSM data..."
-msgstr "Laen alla OSM andmeid..."
+msgstr "Laadin alla OSM andmeid..."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:352
@@ -16588,5 +16677,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr ""
+msgstr "See JOSM versioon ei ole ühilduv määratud serveriga."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
@@ -16626,5 +16715,5 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
+msgstr "Muutustekogum {0} edukalt avatud"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378
@@ -16730,5 +16819,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
@@ -16844,5 +16933,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
@@ -16853,5 +16941,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
@@ -16879,4 +16967,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
@@ -16922,14 +17011,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
@@ -16939,10 +17028,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
@@ -16951,5 +17041,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
@@ -16959,16 +17049,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
@@ -16976,5 +17061,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
@@ -16982,5 +17067,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
@@ -16989,5 +17074,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
@@ -16997,21 +17082,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 "Puudulik <member> määratlus ref=0"
 
-#: ../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
@@ -17020,5 +17099,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
@@ -17026,6 +17105,6 @@
 msgstr "Keelatud objekti number 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
@@ -17038,8 +17117,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
@@ -17053,5 +17132,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
@@ -17059,5 +17138,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
@@ -17066,6 +17145,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
@@ -17079,6 +17158,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
@@ -17089,5 +17168,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
@@ -17096,5 +17175,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
@@ -17103,52 +17182,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 "OSM andmeid ettevalmistamine..."
 
-#: ../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 "Valmistan andmeko"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584
+msgstr "Andmekogu ettevalmistamine..."
+
+#: ../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
@@ -17163,5 +17209,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
-msgstr "Laen alla viitavad teed...."
+msgstr "Laadin alla viitavad teed...."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
@@ -17177,5 +17223,5 @@
 #: ../plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java:71
 msgid "Downloading changesets ..."
-msgstr "Laen alla muutustekogumid...."
+msgstr "Laadin alla muutustekogumid...."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
@@ -17278,5 +17324,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "Alustan üleslaadimist ühe seansina..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -17287,5 +17333,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:140
 msgid "Starting to upload in chunks..."
-msgstr ""
+msgstr "Alustan üleslaadimist tükkidena..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
@@ -17303,4 +17349,33 @@
 msgid "Unexpected id 0 for osm primitive found"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "OSM serveri failid"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, 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 "Muutustekogum {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 "Laadin alla OSM andmeid..."
 
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
@@ -17326,11 +17401,4 @@
 msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
 
-#: ../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
@@ -17346,29 +17414,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 ""
 
@@ -17441,5 +17484,5 @@
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
+msgstr "Plugin {1} vajab tööks JOSM versiooni {0}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:109
@@ -17508,4 +17551,6 @@
 "updated as well.<br><br>Update plugins now?"
 msgstr ""
+"Olete uuendanud JOSM tarkvara.<br>Probleemide vältmiseks tuleb uuendada ka "
+"pluginad..<br><br>Kas uuendan need nüüd?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:275
@@ -17531,4 +17576,6 @@
 "disabled."
 msgstr ""
+"Pluginate uuendamine pärast JOSM uuendamist jäetakse vahele. Automaatne "
+"uuendamine käivitamisel on välja lülitatud."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
@@ -17808,5 +17855,5 @@
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
-msgstr ""
+msgstr "Pluginate nimekirja allalaadimine aadressilt ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263
@@ -18113,10 +18160,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
@@ -18126,5 +18173,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
@@ -18133,6 +18180,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 ""
@@ -18167,5 +18214,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18178,5 +18225,5 @@
 "\n"
 
-#: ../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"
@@ -18186,5 +18233,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18195,5 +18242,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 "(Vihje: Kiirkorraldusi saad muuta seadete alt..)"
@@ -18826,16 +18873,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 "
@@ -18845,15 +18897,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 "
@@ -18863,5 +18915,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -18870,10 +18922,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 "
@@ -18882,10 +18934,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
 msgstr "Aitab WMS kujutisi vektoriseerida"
 
 #. 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 "
@@ -18894,5 +18946,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."
@@ -18900,5 +18952,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 "
@@ -18908,5 +18960,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 "
@@ -18916,25 +18968,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 "Muuda ala lihtsal viisil liitalaks."
 
 #. 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. "
@@ -18943,5 +18995,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 "
@@ -18951,15 +19003,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"
@@ -18967,5 +19019,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."
@@ -18973,10 +19025,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 "
@@ -18985,5 +19037,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 "
@@ -18992,15 +19044,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."
@@ -19008,25 +19060,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 "
@@ -19036,5 +19088,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 "
@@ -19043,10 +19095,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 "
@@ -19056,20 +19108,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 "
@@ -19079,15 +19131,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). "
@@ -19096,5 +19148,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) "
@@ -19103,10 +19155,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."
@@ -19114,5 +19166,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19123,15 +19175,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 "
@@ -19141,5 +19193,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19148,20 +19200,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 "
@@ -19326,9 +19378,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 ""
@@ -19381,6 +19433,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 ""
@@ -19429,9 +19481,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 "Ühesuunaline"
@@ -19481,9 +19533,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 "Sild"
@@ -19524,9 +19576,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 "Tunnel"
@@ -19565,9 +19617,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 ""
@@ -19606,9 +19658,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 ""
@@ -19647,9 +19699,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 ""
@@ -19735,4 +19787,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"
@@ -19750,8 +19803,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 ""
@@ -19771,4 +19825,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
@@ -19786,8 +19841,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 ""
@@ -19807,4 +19863,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
@@ -19822,8 +19879,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 ""
@@ -19843,4 +19901,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
@@ -19858,8 +19917,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 ""
@@ -19879,4 +19939,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
@@ -19894,8 +19955,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 ""
@@ -19968,5 +20030,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 ""
@@ -19998,10 +20060,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 ""
@@ -20043,9 +20105,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 ""
@@ -20070,9 +20132,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 ""
@@ -20096,9 +20158,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 ""
@@ -20122,9 +20184,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 ""
@@ -20149,9 +20211,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 ""
@@ -20176,9 +20238,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 ""
@@ -20198,4 +20260,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
@@ -20204,10 +20267,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 "puit"
@@ -20231,9 +20294,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 ""
@@ -20258,9 +20321,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 ""
@@ -20285,9 +20348,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 ""
@@ -20311,9 +20374,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 ""
@@ -20337,9 +20400,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 ""
@@ -20363,9 +20426,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 ""
@@ -20390,9 +20453,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 ""
@@ -20417,9 +20480,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 ""
@@ -20445,10 +20508,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 "pinnas"
@@ -20599,5 +20662,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 ""
@@ -20751,64 +20814,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
@@ -20884,8 +20947,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"
@@ -20915,8 +20978,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 ""
@@ -20966,9 +21029,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"
@@ -21011,9 +21074,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"
@@ -21034,7 +21097,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 ""
@@ -21054,7 +21117,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 ""
@@ -21194,61 +21257,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
@@ -21282,10 +21345,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 ""
@@ -21317,10 +21380,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 ""
@@ -21339,11 +21402,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 ""
@@ -21361,5 +21424,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 ""
@@ -21380,12 +21443,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 "Mootorratas"
@@ -21403,10 +21466,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 ""
@@ -21506,6 +21569,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 ""
@@ -21513,5 +21576,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 ""
@@ -21531,6 +21594,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 ""
@@ -21538,5 +21601,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 ""
@@ -21556,6 +21619,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 ""
@@ -21563,5 +21626,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 ""
@@ -21581,6 +21644,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 ""
@@ -21600,6 +21663,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 ""
@@ -21607,5 +21670,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 ""
@@ -21619,6 +21682,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 ""
@@ -21626,5 +21689,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 ""
@@ -21665,6 +21728,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 ""
@@ -21672,5 +21735,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 ""
@@ -21695,7 +21758,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 ""
@@ -21731,11 +21794,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 "Lisa andmeid"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "Teed"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr ""
@@ -21744,35 +21818,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 "Lisa andmeid"
 
 #. 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 ""
@@ -21780,10 +21854,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 ""
@@ -21791,5 +21865,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr ""
@@ -21798,50 +21872,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 "Lisa andmeid"
 
 #. 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, "
@@ -21850,5 +21924,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 "
@@ -21858,5 +21932,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 "
@@ -21865,5 +21939,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, "
@@ -21872,5 +21946,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, "
@@ -21880,5 +21954,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"
@@ -21886,10 +21960,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 ""
@@ -21897,15 +21971,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 ""
@@ -21928,23 +22002,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 "Ratastoolid"
 
 #. 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 ""
@@ -21953,5 +22027,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21959,5 +22033,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 "Lisa andmeid"
@@ -21965,5 +22039,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -21971,10 +22045,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 ""
@@ -21983,6 +22057,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 ""
@@ -22033,27 +22107,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 "rada"
@@ -22062,6 +22136,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 ""
@@ -22070,6 +22144,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 ""
@@ -22078,6 +22152,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 ""
@@ -22086,6 +22160,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 ""
@@ -22094,21 +22168,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 ""
@@ -22116,15 +22190,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 ""
@@ -22142,11 +22216,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 "Lisa andmeid"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr ""
@@ -22154,5 +22228,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22160,5 +22234,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22166,5 +22240,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr ""
@@ -22173,5 +22247,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 "Lisa andmeid"
@@ -22179,5 +22253,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr ""
@@ -22187,10 +22261,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 "Lisa andmeid"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr ""
@@ -22198,5 +22272,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"
@@ -22204,5 +22278,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr ""
@@ -22210,10 +22284,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 "Lisa andmeid"
 
 #. 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
@@ -22222,10 +22296,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 ""
@@ -22233,5 +22307,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 "Lisa andmeid"
@@ -22325,42 +22399,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 "Operaatorfirma"
@@ -22369,6 +22443,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 "Tualetid"
@@ -22376,5 +22450,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -22382,5 +22456,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 "Lisa andmeid"
@@ -22388,5 +22462,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr ""
@@ -22396,5 +22470,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr ""
@@ -22404,5 +22478,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 "Ülekäiguraja tüüp"
@@ -22411,6 +22485,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 ""
@@ -22419,6 +22493,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 ""
@@ -22427,6 +22501,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 ""
@@ -22435,6 +22509,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 ""
@@ -22443,6 +22517,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 ""
@@ -22451,6 +22525,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 ""
@@ -22459,11 +22533,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 ""
@@ -22471,5 +22545,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 ""
@@ -22477,5 +22551,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 ""
@@ -22483,5 +22557,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 ""
@@ -22489,5 +22563,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 ""
@@ -22495,5 +22569,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 ""
@@ -22501,5 +22575,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 ""
@@ -22507,5 +22581,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr ""
@@ -22513,5 +22587,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "Miniring"
@@ -22522,15 +22596,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 "Ülekäigurada"
@@ -22539,15 +22613,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 "Lisa andmeid"
 
 #. 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 "Liikluse rahustamine"
@@ -22555,40 +22629,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 "Lisa andmeid"
 
 #. 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 ""
@@ -22596,5 +22670,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 "Lisa andmeid"
@@ -22602,5 +22676,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 ""
@@ -22610,5 +22684,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 "Linnapiiri märk"
@@ -22616,15 +22690,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 "Lisa andmeid"
 
 #. 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 "Kiiruskaamera"
@@ -22634,5 +22708,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr ""
@@ -22641,17 +22715,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 "Lisa andmeid"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr ""
@@ -22659,5 +22722,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 "Lisa andmeid"
@@ -22669,7 +22732,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 ""
@@ -22704,18 +22767,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 "Vikipeedia"
@@ -22723,5 +22786,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Tõkked"
@@ -22729,5 +22792,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr "Pollar"
@@ -22735,5 +22798,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 "Lisa andmeid"
@@ -22783,27 +22846,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 ""
@@ -22811,10 +22874,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 "Lisa andmeid"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr ""
@@ -22822,15 +22885,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 "Lisa andmeid"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:922
 msgid "Toll Booth"
 msgstr "Toll"
@@ -22838,5 +22901,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 "Lisa andmeid"
@@ -22844,10 +22907,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "Piirikontroll"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "Lisa andmeid"
@@ -22856,5 +22919,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr ""
@@ -22863,24 +22926,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 "elekter"
+
+#. 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 "post"
+
+#. 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 ""
@@ -22888,5 +22970,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr ""
@@ -22895,5 +22977,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 ""
@@ -22904,15 +22986,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 "Lisa andmeid"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr "Värav"
@@ -22920,50 +23002,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 "Lisa andmeid"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "Tõkkepuu"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
 msgstr ""
@@ -22971,25 +23053,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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
@@ -22999,6 +23081,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 "Vesi"
@@ -23006,5 +23088,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "Äravoolutoru"
@@ -23012,10 +23094,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 "Lisa andmeid"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr "Kraav"
@@ -23023,10 +23105,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 "Lisa andmeid"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1095
 msgid "Stream"
 msgstr "Oja"
@@ -23034,10 +23116,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 "Lisa andmeid"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "Kanal"
@@ -23045,10 +23127,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 "Lisa andmeid"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "Jõgi"
@@ -23058,5 +23140,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 "Lisa andmeid"
@@ -23064,5 +23146,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Allikas"
@@ -23070,20 +23152,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 "Lisa andmeid"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Kosk"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "Pais"
@@ -23091,10 +23173,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 "Lisa andmeid"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Tamm"
@@ -23102,10 +23184,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 "Lisa andmeid"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
 msgstr ""
@@ -23113,5 +23195,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 "Lisa andmeid"
@@ -23121,15 +23203,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
+#: build/trans_presets.java:1159
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
 #: build/trans_presets.java:1160
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr ""
@@ -23137,15 +23219,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 "Lisa andmeid"
 
 #. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1172
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #: build/trans_presets.java:1173
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
 msgid "Edit Covered Reservoir"
 msgstr "Lisa andmeid"
@@ -23153,20 +23235,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 "Lisa andmeid"
 
 #. item "Water/Water/Land"
+#: build/trans_presets.java:1184
+msgid "Land"
+msgstr ""
+
+#. item "Water/Water/Land" label "Edit Land"
 #: build/trans_presets.java:1185
-msgid "Land"
-msgstr ""
-
-#. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
 msgid "Edit Land"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Rannik"
@@ -23174,10 +23256,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 "Lisa andmeid"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "Jõekallas"
@@ -23186,5 +23268,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 "Lisa andmeid"
@@ -23192,5 +23274,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr ""
@@ -23201,15 +23283,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 "Lisa andmeid"
 
 #. 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 "raba"
@@ -23222,40 +23304,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 "roostik"
 
 #. 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 "padumeri"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "mangroov"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "Muda"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Rand"
@@ -23263,20 +23345,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 "Lisa andmeid"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Laht"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Lisa andmeid"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr ""
@@ -23284,15 +23366,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 "Lisa andmeid"
 
 #. group "Shipping"
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1236
 msgid "Shipping"
 msgstr "Laevandus"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1237
 msgid "Ferry Terminal"
 msgstr "Sadamaterminal"
@@ -23300,20 +23382,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 "Lisa andmeid"
 
 #. 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 ""
@@ -23399,26 +23481,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 "jalgrattaga"
 
 #. 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 ""
@@ -23426,5 +23508,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 "Lisa andmeid"
@@ -23433,15 +23515,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Jahisadam"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "Lisa andmeid"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "Kai"
@@ -23449,10 +23531,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 "Lisa andmeid"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr ""
@@ -23461,5 +23543,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 ""
@@ -23469,5 +23551,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr ""
@@ -23477,10 +23559,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 "Lisa andmeid"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1282
 msgid "Boatyard"
 msgstr ""
@@ -23488,10 +23570,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 "Lisa andmeid"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1289
 msgid "Dock"
 msgstr ""
@@ -23499,20 +23581,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 "Lisa andmeid"
 
 #. 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 "Raudtee"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr ""
@@ -23520,5 +23602,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 "Lisa andmeid"
@@ -23548,7 +23630,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 ""
@@ -23564,8 +23646,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 ""
@@ -23579,8 +23661,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 ""
@@ -23594,8 +23676,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 ""
@@ -23609,8 +23691,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 ""
@@ -23623,8 +23705,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 ""
@@ -23637,8 +23719,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 ""
@@ -23667,4 +23749,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
@@ -23699,12 +23788,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
@@ -23722,9 +23812,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 "Pinge"
@@ -23737,8 +23827,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 ""
@@ -23751,8 +23841,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 ""
@@ -23760,10 +23850,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 "Lisa andmeid"
@@ -23771,5 +23861,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr ""
@@ -23777,5 +23867,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 "Lisa andmeid"
@@ -23783,10 +23873,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 "Lisa andmeid"
@@ -23794,10 +23884,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 "Lisa andmeid"
@@ -23805,10 +23895,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "Metroo"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "Lisa andmeid"
@@ -23816,10 +23906,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1373
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram" label "Edit Tram"
 #: build/trans_presets.java:1374
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
 msgid "Edit Tram"
 msgstr "Lisa andmeid"
@@ -23827,5 +23917,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr ""
@@ -23833,5 +23923,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 "Lisa andmeid"
@@ -23840,10 +23930,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1405
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #: build/trans_presets.java:1406
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
 msgid "Edit Disused Railway"
 msgstr "Lisa andmeid"
@@ -23852,10 +23942,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 ""
@@ -23864,5 +23954,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr ""
@@ -23871,5 +23961,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr ""
@@ -23879,5 +23969,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr ""
@@ -23885,5 +23975,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr ""
@@ -23892,5 +23982,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 ""
@@ -23899,10 +23989,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Köisraudteed"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr ""
@@ -23910,5 +24000,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 "Lisa andmeid"
@@ -23930,12 +24020,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 "Viitenumber"
@@ -23961,14 +24051,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 ""
@@ -23986,10 +24076,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 ""
@@ -23997,5 +24087,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 ""
@@ -24005,6 +24095,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 ""
@@ -24012,5 +24102,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr ""
@@ -24018,5 +24108,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 "Lisa andmeid"
@@ -24024,5 +24114,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr ""
@@ -24030,10 +24120,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 "Lisa andmeid"
 
 #. 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 ""
@@ -24041,5 +24131,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr ""
@@ -24047,10 +24137,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 "Lisa andmeid"
 
 #. 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 ""
@@ -24058,5 +24148,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24064,10 +24154,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 ""
@@ -24075,5 +24165,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24081,5 +24171,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 ""
@@ -24087,5 +24177,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24093,5 +24183,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 ""
@@ -24099,5 +24189,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24105,5 +24195,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 ""
@@ -24111,5 +24201,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24117,5 +24207,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 ""
@@ -24123,5 +24213,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24129,5 +24219,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 ""
@@ -24135,5 +24225,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24141,5 +24231,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24149,5 +24239,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24156,5 +24246,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"
@@ -24162,5 +24252,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24169,5 +24259,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"
@@ -24185,6 +24275,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 ""
@@ -24193,5 +24283,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 "Lisa andmeid"
@@ -24199,5 +24289,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 ""
@@ -24205,5 +24295,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 ""
@@ -24211,10 +24301,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 "maa-alune"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr ""
@@ -24225,7 +24315,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 ""
@@ -24233,25 +24323,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 ""
@@ -24259,5 +24349,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr ""
@@ -24267,5 +24357,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 "Lisa andmeid"
@@ -24278,117 +24368,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 ""
@@ -24481,48 +24571,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 "Avatud"
@@ -24613,47 +24703,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 ""
@@ -24745,47 +24835,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 ""
@@ -24855,126 +24945,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 ""
@@ -24982,5 +25072,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -24988,20 +25078,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 "Lisa andmeid"
 
 #. 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:1639
+msgid "Wash"
+msgstr ""
+
+#. item "Car/Wash" label "Edit Car Wash"
 #: build/trans_presets.java:1640
-msgid "Wash"
-msgstr ""
-
-#. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
 msgid "Edit Car Wash"
 msgstr "Lisa andmeid"
@@ -25009,5 +25099,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr "Automüüja"
@@ -25015,5 +25105,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 "Lisa andmeid"
@@ -25021,20 +25111,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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
@@ -25042,5 +25132,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 ""
@@ -25084,15 +25174,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 "Telefoninumber"
@@ -25117,14 +25207,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 "Faksinumber"
@@ -25152,15 +25242,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 "Veebileht"
@@ -25185,14 +25275,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 "E-posti aadress"
@@ -25202,6 +25292,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 ""
@@ -25210,10 +25300,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 "Lisa andmeid"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr ""
@@ -25221,5 +25311,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 "Lisa andmeid"
@@ -25228,16 +25318,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 "Lisa andmeid"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
 msgstr "Motopood"
@@ -25245,25 +25335,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 "Lisa andmeid"
 
 #. 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"
@@ -25271,5 +25361,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25277,5 +25367,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25283,5 +25373,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25292,6 +25382,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 ""
@@ -25299,35 +25389,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 ""
@@ -25337,6 +25427,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 "Riided"
@@ -25344,10 +25434,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 "Lisa andmeid"
 
+#. 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 "Katusega"
+
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1740
 msgid "Bike Dealer"
 msgstr "Jalgrattamüüja"
@@ -25356,40 +25492,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 "Lisa andmeid"
 
 #. 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 ""
@@ -25398,10 +25534,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 "Lisa andmeid"
 
 #. 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"
@@ -25409,5 +25545,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -25417,5 +25553,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"
@@ -25423,5 +25559,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr ""
@@ -25429,5 +25565,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr ""
@@ -25435,5 +25571,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 "Lisa andmeid"
@@ -25441,5 +25577,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr ""
@@ -25448,5 +25584,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 "Lisa andmeid"
@@ -25454,5 +25590,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "Raudteeplatvorm"
@@ -25461,5 +25597,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 "Lisa andmeid"
@@ -25471,5 +25607,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 ""
@@ -25478,11 +25614,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 "Metroo sissepääs"
@@ -25491,5 +25627,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 "Lisa andmeid"
@@ -25497,5 +25633,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 ""
@@ -25504,5 +25640,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr ""
@@ -25511,5 +25647,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 "Lisa andmeid"
@@ -25517,5 +25653,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr ""
@@ -25525,5 +25661,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 "Lisa andmeid"
@@ -25532,6 +25668,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
@@ -25543,10 +25679,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 ""
@@ -25554,10 +25690,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 "Lisa andmeid"
@@ -25565,10 +25701,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 "Viitenumber"
@@ -25577,6 +25713,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 "Mündid"
@@ -25585,6 +25721,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 "Märkused"
@@ -25593,6 +25729,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 "Elektroonilised rahakotid ja krediitkaardid"
@@ -25601,6 +25737,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 "Deebetkaart"
@@ -25609,6 +25745,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 "Krediitkaart"
@@ -25616,10 +25752,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 "Takso"
@@ -25627,5 +25763,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 "Lisa andmeid"
@@ -25633,10 +25769,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 "Lennujaam"
@@ -25644,5 +25780,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 "Lisa andmeid"
@@ -25650,10 +25786,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 ""
@@ -25662,5 +25798,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr ""
@@ -25668,5 +25804,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 "Lisa andmeid"
@@ -25674,5 +25810,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr "Ruleerimistee"
@@ -25680,5 +25816,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 "Lisa andmeid"
@@ -25686,5 +25822,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr "Kopteriväljak"
@@ -25692,5 +25828,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 "Lisa andmeid"
@@ -25700,5 +25836,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 "Perroon"
@@ -25708,5 +25844,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 "Angaar"
@@ -25717,6 +25853,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 "Tuletorn"
@@ -25726,5 +25862,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 "Tuulekott"
@@ -25733,5 +25869,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr "Terminal"
@@ -25739,10 +25875,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 "Lisa andmeid"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1935
 msgctxt "airport"
 msgid "Gate"
@@ -25751,15 +25887,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 "Värav"
 
 #. 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 "Teenused"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1944
 msgid "Accommodation"
 msgstr "Majutus"
@@ -25771,5 +25907,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 "Hotell"
@@ -25778,5 +25914,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 "Lisa andmeid"
@@ -25790,8 +25926,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 "Tähti"
@@ -25827,12 +25963,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 "Internetiühendus"
@@ -25853,12 +25989,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 ""
@@ -25879,12 +26015,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 ""
@@ -25911,12 +26047,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 "terminal"
@@ -25937,12 +26073,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 "Tasuline internetiühendus"
@@ -25965,12 +26101,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 "Suitsetamine"
@@ -25992,12 +26128,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 ""
@@ -26019,12 +26155,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 ""
@@ -26046,17 +26182,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 "Motell"
@@ -26064,20 +26200,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 "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Külalistemaja"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr ""
@@ -26085,10 +26221,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 "Lisa andmeid"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
 msgstr ""
@@ -26096,15 +26232,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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
@@ -26112,10 +26248,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 "Lisa andmeid"
@@ -26123,30 +26259,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 "Kohtade arv"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "Requires a fee"
 msgstr "Tasu"
 
 #. 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 "Elektrivarustus"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2065
 msgid "Tents allowed"
 msgstr "Telkimine lubatud"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2072
 msgid "Camping Site"
 msgstr "Laagriplats"
@@ -26154,10 +26290,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 "Lisa andmeid"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -26168,5 +26304,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 "Restoran"
@@ -26174,5 +26310,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 "Lisa andmeid"
@@ -26181,6 +26317,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 "Rahvuslik köök"
@@ -26188,5 +26324,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 "itaalia"
@@ -26194,5 +26330,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 "hiina"
@@ -26200,5 +26336,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 "pizza"
@@ -26206,5 +26342,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 "burger"
@@ -26212,5 +26348,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 "kreeka"
@@ -26218,5 +26354,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 "saksa"
@@ -26224,5 +26360,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 "india"
@@ -26230,5 +26366,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 "kohalik"
@@ -26236,5 +26372,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 "kebab"
@@ -26242,5 +26378,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 "türgi"
@@ -26248,5 +26384,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 "aasia"
@@ -26254,5 +26390,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 "tai"
@@ -26260,5 +26396,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 "mehhiko"
@@ -26266,5 +26402,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 "jaapani"
@@ -26272,5 +26408,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 "prantsuse"
@@ -26278,5 +26414,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 "võileivad"
@@ -26284,5 +26420,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 "sushi"
@@ -26290,10 +26426,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 "Pisipruulikoda"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2112
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -26301,20 +26437,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 "Lisa andmeid"
 
 #. 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 "kana"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2131
 msgid "Food Court"
 msgstr "Söögihall"
@@ -26322,10 +26458,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 "Lisa andmeid"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2148
 msgid "Cafe"
 msgstr "Kohvik"
@@ -26333,15 +26469,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 "Lisa andmeid"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "ice_cream"
 msgstr "jäätis"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2167
 msgid "Pub"
 msgstr "Pubi"
@@ -26349,20 +26485,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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr "Baar"
@@ -26370,10 +26506,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 "Lisa andmeid"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2219
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -26381,25 +26517,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 "Lisa andmeid"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Turism"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr "Lisa andmeid"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "Vaatepunkt"
@@ -26407,10 +26543,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 "Lisa andmeid"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "Vaatetorn"
@@ -26418,20 +26554,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "Infopunkt"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr "Detailsuse aste"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "topo"
@@ -26464,32 +26600,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 "tänav"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr "skeem"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr "Näidatud ala"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr "objekt"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "linn"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "regioon"
@@ -26498,6 +26634,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 "Täpsem kirjeldus"
@@ -26507,5 +26643,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 "Märgitud marsruudid:"
@@ -26513,5 +26649,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 "Matkamine"
@@ -26520,6 +26656,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 "Jalgrattasõit"
@@ -26527,5 +26663,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 "Mägimatkamine"
@@ -26534,6 +26670,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 "Suusatamine"
@@ -26541,5 +26677,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 "Ratsutamine"
@@ -26547,50 +26683,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 "... võimalikud muud transpordiviisid."
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "Infotahvel"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
 msgstr "Infotahvli sisu"
 
 #. 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 "ajalugu"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "loodus"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
 msgstr "loomad"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr "taimed"
 
 #. 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 "Infoterminal"
@@ -26598,10 +26734,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 "Täpsem kirjeldus"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr "Audiogiid"
@@ -26609,25 +26745,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 "Audiogiid telefonis?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr "Telefoninumber"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr "Muud infopuntid"
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Kino"
@@ -26636,10 +26772,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 "Lisa andmeid"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -26648,10 +26784,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 "Lisa andmeid"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -26660,45 +26796,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 "Teemapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Lisa andmeid"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr ""
@@ -26708,5 +26844,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 "Lisa andmeid"
@@ -26734,20 +26870,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 ""
@@ -26755,5 +26891,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -26761,15 +26897,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 "Lisa andmeid"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "Lisa andmeid"
@@ -26777,10 +26913,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 "Lõkkease"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
 msgstr ""
@@ -26788,15 +26924,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 "Lisa andmeid"
 
-#. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2396
-msgid "Covered"
-msgstr "Katusega"
-
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgctxt "grill"
 msgid "Fuel"
@@ -26804,30 +26935,25 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "charcoal"
 msgstr "süsi"
 
-#. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
-msgid "electric"
-msgstr "elekter"
-
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2400
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "Lisa andmeid"
 
 #. group "Culture"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2406
 msgid "Culture"
 msgstr "Kultuur"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Museum"
 msgstr "Muuseum"
@@ -26835,10 +26961,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 "Lisa andmeid"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Teater"
@@ -26847,10 +26973,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 "Lisa andmeid"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Raamatukogu"
@@ -26859,10 +26985,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 "Lisa andmeid"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Kunstikeskus"
@@ -26870,10 +26996,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 "Lisa andmeid"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Kunstiteos"
@@ -26881,10 +27007,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 "Lisa andmeid"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -26894,5 +27020,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 "Lisa andmeid"
@@ -26901,6 +27027,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 "Religioon"
@@ -26909,6 +27035,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 ""
@@ -26917,6 +27043,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 "budist"
@@ -26925,6 +27051,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 "kristlane"
@@ -26933,6 +27059,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 "hindu"
@@ -26941,6 +27067,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 ""
@@ -26949,6 +27075,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 "juudi"
@@ -26957,6 +27083,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 "moslem"
@@ -26965,6 +27091,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 "sikh"
@@ -26973,6 +27099,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 "spiritualist"
@@ -26981,6 +27107,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 "taoist"
@@ -26989,6 +27115,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 ""
@@ -26997,6 +27123,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 "zoroastrism (pärsia)"
@@ -27005,6 +27131,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 "Usutunnistus"
@@ -27013,6 +27139,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 "anglikaan"
@@ -27021,6 +27147,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 "baptist"
@@ -27029,6 +27155,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 "katoliku"
@@ -27037,6 +27163,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 "evangeelne"
@@ -27045,6 +27171,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 "jehoovatunnistajad"
@@ -27053,6 +27179,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 "luterlane"
@@ -27061,6 +27187,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 "metodist"
@@ -27069,6 +27195,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 "mormoon"
@@ -27077,6 +27203,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 "ortodoksne"
@@ -27085,6 +27211,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 "nelipühalane"
@@ -27093,6 +27219,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 "presbüterlane"
@@ -27101,6 +27227,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 "protestantlik"
@@ -27109,6 +27235,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 "kveeker"
@@ -27117,6 +27243,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 "šiia"
@@ -27125,36 +27251,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 "Salvestusstuudio"
@@ -27162,15 +27288,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 "Lisa andmeid"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "audio"
 msgstr "heli"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "video"
 msgstr "video"
@@ -27178,5 +27304,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 "Ühiskondlik hoone"
@@ -27184,10 +27310,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 "Lisa andmeid"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Raekoda"
@@ -27195,5 +27321,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 "Lisa andmeid"
@@ -27202,10 +27328,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 "Külakeskus"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2488
 msgid "Embassy"
 msgstr "Saatkond"
@@ -27213,10 +27339,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 "Lisa andmeid"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -27225,10 +27351,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 "Lisa andmeid"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Vangla"
@@ -27237,10 +27363,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 "Lisa andmeid"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "Politsei"
@@ -27250,10 +27376,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 "Lisa andmeid"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -27262,10 +27388,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 "Lisa andmeid"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Postkontor"
@@ -27273,25 +27399,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 "Lisa andmeid"
 
 #. group "Education"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2531
 msgid "Education"
 msgstr "Haridus"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2532
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "Lisa andmeid"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "Kool"
@@ -27299,10 +27425,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 "Lisa andmeid"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Ülikool"
@@ -27310,10 +27436,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 "Lisa andmeid"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "Rakenduskõrgkool"
@@ -27321,10 +27447,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 "Lisa andmeid"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr "Sõidukool"
@@ -27332,20 +27458,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 "Lisa andmeid"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2562
 msgid "License Classes"
 msgstr "Juhtimisõiguse kategooriad"
 
 #. group "Health"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Health"
 msgstr "Tervis"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Haigla"
@@ -27353,10 +27479,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 "Lisa andmeid"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "Arstid"
@@ -27364,25 +27490,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 "Lisa andmeid"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "Lisa andmeid"
 
 #. 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 ""
@@ -27390,5 +27516,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -27396,5 +27522,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 "Lisa andmeid"
@@ -27402,10 +27528,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2596
 msgid "Dispensing"
 msgstr "Retseptuur"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2600
 msgid "Hearing Aids"
 msgstr ""
@@ -27413,5 +27539,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 "Lisa andmeid"
@@ -27419,5 +27545,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr ""
@@ -27425,5 +27551,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 "Lisa andmeid"
@@ -27431,5 +27557,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -27438,5 +27564,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 "Lisa andmeid"
@@ -27445,15 +27571,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 "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2625
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. 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 "(Kasuta riigikoodi, näiteks +12-345-67890)"
@@ -27462,5 +27588,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -27469,10 +27595,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 "Lisa andmeid"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr ""
@@ -27480,15 +27606,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 "Märkus"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "Postkast"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Telefon"
@@ -27497,15 +27623,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 "Lisa andmeid"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr "Kell"
@@ -27514,5 +27640,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 "Lisa andmeid"
@@ -27522,5 +27648,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 "Ekraan"
@@ -27528,5 +27654,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"
@@ -27535,5 +27661,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"
@@ -27541,5 +27667,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -27547,5 +27673,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -27553,60 +27679,55 @@
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "Support"
 msgstr "Kinnitus"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
-msgid "pole"
-msgstr "post"
-
-#. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "wall_mounted"
 msgstr "seinakell"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "billboard"
 msgstr "reklaamtahvel"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "Visibility/readability"
 msgstr "Nähtavus/loetavus"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 5m)"
 msgstr "(kuni 5m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 20m)"
 msgstr "(kuni 20m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(more than 20m)"
 msgstr "(üle 20m)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2679
 msgid "Shows current date"
 msgstr "Näitab kuupäeva"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2680
 msgid "Shows temperature"
 msgstr "Näitab temperatuuri"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2681
 msgid "Shows barometric pressure"
 msgstr "Näitab õhurõhku"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2682
 msgid "Shows humidity"
 msgstr "Näitab niiskust"
@@ -27614,5 +27735,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -27621,5 +27742,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 "Lisa andmeid"
@@ -27627,40 +27748,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Purgid"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. 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 "Prügikorv"
@@ -27668,5 +27789,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 "Lisa andmeid"
@@ -27675,30 +27796,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2707
 msgid "Backrest"
 msgstr "Seljatugi"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "stone"
 msgstr "kivi"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "plastic"
 msgstr "plastikust"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "black"
@@ -27706,5 +27827,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -27712,5 +27833,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -27718,5 +27839,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -27724,5 +27845,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -27730,5 +27851,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -27736,5 +27857,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -27742,20 +27863,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2710
 msgid "Amount of Seats"
 msgstr "Istekohtade arv"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "Edit Shelter"
 msgstr "Lisa andmeid"
 
 #. 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"
@@ -27763,5 +27884,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"
@@ -27769,5 +27890,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"
@@ -27775,5 +27896,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"
@@ -27781,10 +27902,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr "Lisa andmeid"
@@ -27793,10 +27914,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 "Kõrgus"
 
 #. 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"
@@ -27804,20 +27925,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr "pool"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr "täis"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "Peida"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr "Lukusta"
@@ -27825,5 +27946,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Joogivesi"
@@ -27832,10 +27953,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 "Lisa andmeid"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr "Tuletõrjehüdrant"
@@ -27844,5 +27965,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 "Lisa andmeid"
@@ -27850,5 +27971,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"
@@ -27856,5 +27977,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -27862,5 +27983,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -27868,16 +27989,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"
@@ -27885,5 +28006,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"
@@ -27891,5 +28012,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27897,26 +28018,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 ""
@@ -27924,20 +28040,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 "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "Spordirajatised"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "Lisa andmeid"
@@ -27951,6 +28067,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 "vali spordiala:"
@@ -28296,34 +28412,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 "sport"
@@ -28333,6 +28449,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 ""
@@ -28342,6 +28458,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 "vibusport"
@@ -28351,6 +28467,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 ""
@@ -28360,6 +28476,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 ""
@@ -28369,6 +28485,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 ""
@@ -28378,6 +28494,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 "pesapall"
@@ -28387,6 +28503,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 "korvpall"
@@ -28396,6 +28512,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 ""
@@ -28405,6 +28521,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 ""
@@ -28414,6 +28530,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 ""
@@ -28423,6 +28539,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 "kanuu"
@@ -28432,6 +28548,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 ""
@@ -28441,6 +28557,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 ""
@@ -28450,6 +28566,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 ""
@@ -28459,6 +28575,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 ""
@@ -28468,6 +28584,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 ""
@@ -28477,6 +28593,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 ""
@@ -28486,6 +28602,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 ""
@@ -28495,6 +28611,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 ""
@@ -28504,6 +28620,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 "golf"
@@ -28513,6 +28629,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 ""
@@ -28522,6 +28638,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 ""
@@ -28531,6 +28647,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 ""
@@ -28540,6 +28656,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 ""
@@ -28549,6 +28665,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 ""
@@ -28558,6 +28674,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 ""
@@ -28567,6 +28683,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 ""
@@ -28576,6 +28692,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 ""
@@ -28585,6 +28701,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 ""
@@ -28594,6 +28710,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 "rula"
@@ -28603,6 +28719,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 "uisutamine"
@@ -28612,6 +28728,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 "suusatamine"
@@ -28621,6 +28737,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 "jalgpall"
@@ -28630,6 +28746,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 "ujumine"
@@ -28639,6 +28755,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 "lauatennis"
@@ -28648,71 +28764,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 "tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2764
 msgid "Sports Centre"
 msgstr "Spordikeskus"
 
 #. 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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "Võidusõidurada"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. 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 "Lisa andmeid"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2797
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. 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 "Lisa andmeid"
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2805
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
 msgstr "Lisa andmeid"
@@ -28760,25 +28876,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 "tüüp"
@@ -28828,26 +28944,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 ""
@@ -28897,26 +29013,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 "spordihall"
@@ -28961,149 +29077,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 "staadion"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2811
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "Ronimine"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "Kanuusõit"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr "Koerte võidujooks"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "Ratsasport"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr "Traavivõistlused"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "Võimlemine"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "Uisutamine"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr "Rulasõit"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr "Lisa andmeid"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "Lisa andmeid"
@@ -29111,60 +29227,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 "Lisa andmeid"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr "Nõlva liik"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "mägi"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "murdmaa"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
 msgstr "lumepark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "algaja"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "kerge"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
 msgstr "edasijõudnu"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "expert"
 msgstr "ekspert"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "freeride"
 msgstr "vabalaskumine"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -29172,105 +29288,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 "Lisa andmeid"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "Sport (pallimängud)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr "Austraalia jalgpall"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "American Football"
 msgstr "Ameerika jalgpall"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit American Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2925
 msgid "Canadian Football"
 msgstr "Kanada jalgpall"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Edit Canadian Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2931
 msgid "Gaelic Football"
 msgstr "Keldi jalgpall"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Edit Gaelic Football"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2937
 msgid "Rugby League"
 msgstr "Rägbiliiga"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Edit Rugby League"
 msgstr "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2949
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr "Võrkpall"
@@ -29278,10 +29394,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 "Lisa andmeid"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "Beachvolleyball"
 msgstr "Rannavõrkpall"
@@ -29289,120 +29405,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 "Lisa andmeid"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2980
 msgid "Edit Golf"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr "Golfiväljak"
 
 #. 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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr "Kriketivõrgud"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "Hoki"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. 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 "Lisa andmeid"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "Lisa andmeid"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3039
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3040
 msgid "Edit Tennis"
 msgstr "Lisa andmeid"
@@ -29410,40 +29526,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 "Mootorisport"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3048
 msgid "Edit Motorsport"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3053
 msgid "Karting"
 msgstr "Kardisõit"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3054
 msgid "Edit Karting"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3059
 msgid "Motocross"
 msgstr "Motokross"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3060
 msgid "Edit Motocross"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3065
 msgid "Safety Training"
 msgstr "Turvalise sõidu koolitus"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3066
 msgid "Edit Safety Training"
 msgstr "Lisa andmeid"
@@ -29451,20 +29567,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3072
 msgid "Model Aerodrome"
 msgstr "Mudelite lennuväli"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3073
 msgid "Edit Model Aerodrome"
 msgstr "Lisa andmeid"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3078
 msgid "RC Car"
 msgstr "Kaugjuhitav auto"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3079
 msgid "Edit RC Car"
 msgstr "Lisa andmeid"
@@ -29472,10 +29588,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 "Inimtekkeline"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "Hoone"
@@ -29483,25 +29599,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 "Torn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "Tower type"
 msgstr "Torni liik"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "communication"
 msgstr "side"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "observation"
 msgstr "vaatlus"
@@ -29510,5 +29626,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 "Kõrgus (meetrites)"
@@ -29516,5 +29632,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr "Lipuvarras"
@@ -29524,15 +29640,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "Tööstushoone"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr "Korsten"
@@ -29540,10 +29656,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3120
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -29551,20 +29667,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "Gaasimõõtejaam"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "Lisa andmeid"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "Torustik"
@@ -29573,5 +29689,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 "Lisa andmeid"
@@ -29615,8 +29731,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
@@ -29626,10 +29742,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 "gaas"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr "soojus"
@@ -29637,20 +29753,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 "õli"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "sewage"
 msgstr "kanalisatsioon"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgid "Location"
 msgstr "Asukoht"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underwater"
@@ -29658,5 +29774,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"
@@ -29664,5 +29780,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Kraana"
@@ -29670,10 +29786,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr "Kaevanduskäik"
@@ -29682,25 +29798,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "Function"
 msgstr "Funktsioon"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "winding"
 msgstr "vintsimine"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "air"
 msgstr "õhk"
 
 #. 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 "Sügavus meetrites"
@@ -29708,5 +29824,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 "Loodusvara"
@@ -29714,5 +29830,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 "killustik"
@@ -29720,5 +29836,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 "boksiit"
@@ -29727,6 +29843,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 "süsi"
@@ -29734,5 +29850,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 "vask"
@@ -29740,5 +29856,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 "tükk-kivi"
@@ -29746,5 +29862,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 "kuld"
@@ -29752,5 +29868,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 "ilmeniit"
@@ -29758,5 +29874,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 "rauamaak"
@@ -29764,5 +29880,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 "plii"
@@ -29770,5 +29886,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 "lubjakivi"
@@ -29776,5 +29892,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 "nikkel"
@@ -29782,5 +29898,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 "rutiil"
@@ -29788,5 +29904,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 "sool"
@@ -29794,5 +29910,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 "hõbe"
@@ -29800,5 +29916,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 "tina"
@@ -29806,5 +29922,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 "tsink"
@@ -29812,10 +29928,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 "tsirkoon"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3156
 msgid "Visible Headframe"
 msgstr "Nähtav šahti väljaehitus"
@@ -29823,10 +29939,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 "stoll"
@@ -29834,10 +29950,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 "Lisa andmeid"
 
 #. 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 "Pikkus meetrites"
@@ -29845,15 +29961,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. 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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr "Veepuhastusjaam"
@@ -29861,10 +29977,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3183
 msgid "Wastewater Plant"
 msgstr "Reoveepuhastusjaam"
@@ -29874,10 +29990,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr "Vesiveski"
@@ -29885,10 +30001,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3198
 msgid "Fountain"
 msgstr "Purskaev"
@@ -29897,10 +30013,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr "Veekaev"
@@ -29908,5 +30024,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 "Lisa andmeid"
@@ -29914,5 +30030,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -29920,5 +30036,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 "Lisa andmeid"
@@ -29926,10 +30042,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3224
 msgid "Street Lamp"
 msgstr "Tänavavalgusti"
@@ -29937,5 +30053,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 "Lisa andmeid"
@@ -29944,15 +30060,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 "Töötamise aeg"
 
 #. 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 "E-R 22:00-05:00"
 
 #. item "Man Made/Man Made/Measurement Station"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3231
 msgid "Measurement Station"
 msgstr "Mõõtejaam"
@@ -29960,55 +30076,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "Measurement"
 msgstr "Mõõtmine"
 
 #. 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 "puisteaine"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "seismic"
 msgstr "seismoloogia"
 
 #. 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 "veetase"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "weather"
 msgstr "ilm"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "Recording"
 msgstr "Salvestamine"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "manually"
 msgstr "käsitsi"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "automated"
 msgstr "automatiseeritud"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "remote"
 msgstr "kaugjuhitav"
 
 #. 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"
@@ -30016,5 +30132,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -30022,10 +30138,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3248
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -30033,30 +30149,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 "Lisa andmeid"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "indoor"
 msgstr "ruumides"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "outdoor"
 msgstr "väljas"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "public"
 msgstr "avalik"
 
 #. group "Power"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3256
 msgid "Power"
 msgstr "Elektrivõrk"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3257
 msgid "Power Generator"
 msgstr "Elektrigeneraator"
@@ -30066,140 +30182,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 "Lisa andmeid"
 
 #. 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 "hüdro"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "tuuma"
 
 #. 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 "tuul"
 
 #. 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 "päikeseenergia"
 
 #. 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 ""
@@ -30207,10 +30323,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 ""
@@ -30225,9 +30341,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 ""
@@ -30242,9 +30358,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 ""
@@ -30259,9 +30375,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 ""
@@ -30276,54 +30392,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 "Elektrijaam"
@@ -30332,10 +30448,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 "Lisa andmeid"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -30344,5 +30460,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 "Lisa andmeid"
@@ -30350,10 +30466,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 "Elektriliini number"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr "Jaotuskilp"
@@ -30362,5 +30478,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 "Lisa andmeid"
@@ -30368,5 +30484,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Elektriliini mast"
@@ -30377,5 +30493,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 "Lisa andmeid"
@@ -30383,10 +30499,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 "Masti number"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3312
+#: build/trans_presets.java:3313
 msgid "Pole"
 msgstr "Elektripost"
@@ -30395,5 +30511,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 "Lisa andmeid"
@@ -30401,10 +30517,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 "Posti tähis"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3320
 msgid "Power Line"
 msgstr "Elektriliin"
@@ -30413,15 +30529,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 "Lisa andmeid"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "line"
@@ -30429,5 +30545,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"
@@ -30435,40 +30551,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3329
 msgid "Amount of Cables"
 msgstr "Juhtmete arv"
 
 #. 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 "üksik"
 
 #. 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 "topelt"
 
 #. 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 "kolmekordne"
 
 #. 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 "Ajaloolised kohad"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Loss"
@@ -30477,20 +30593,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 "Lisa andmeid"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "Arheoloogiamälestis"
@@ -30499,10 +30615,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 "Lisa andmeid"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "Lahingupaik"
@@ -30510,10 +30626,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 "Lisa andmeid"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
 msgstr "Paleontoloogiamälestis"
@@ -30521,5 +30637,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 "Lisa andmeid"
@@ -30527,15 +30643,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3370
 msgid "Edit Monument"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -30543,60 +30659,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 "Lisa andmeid"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr "Teeäärne rist"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr "Teeäärne altar"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr "Lisa andmeid"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr "Piirikivi"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr "Lisa andmeid"
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3398
 msgid "Food"
 msgstr "Söök"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3399
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "Lisa andmeid"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -30604,10 +30720,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 "Lisa andmeid"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -30615,5 +30731,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 "Lisa andmeid"
@@ -30621,5 +30737,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Pagar"
@@ -30627,10 +30743,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 "Lisa andmeid"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Lihunik"
@@ -30638,10 +30754,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 "Lisa andmeid"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr "Mereannid"
@@ -30649,10 +30765,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 "Lisa andmeid"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3443
 msgid "Deli (Fine Food)"
 msgstr "Delikatessid"
@@ -30660,10 +30776,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 "Lisa andmeid"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3451
+#: build/trans_presets.java:3452
 msgid "Confectionery"
 msgstr "Maiustused"
@@ -30671,5 +30787,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 "Lisa andmeid"
@@ -30677,5 +30793,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr "Turg"
@@ -30683,10 +30799,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 "Lisa andmeid"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3468
+#: build/trans_presets.java:3469
 msgid "Greengrocer"
 msgstr "Aedviljad"
@@ -30694,15 +30810,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 "Lisa andmeid"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3477
+#: build/trans_presets.java:3478
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "Lisa andmeid"
@@ -30710,5 +30826,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -30716,25 +30832,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 "Lisa andmeid"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3491
+#: build/trans_presets.java:3492
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3493
 msgid "Edit Beverages Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3501
 msgid "Edit Clothes Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3505
+#: build/trans_presets.java:3506
 msgid "Boutique"
 msgstr ""
@@ -30742,20 +30858,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 "Lisa andmeid"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3514
+#: build/trans_presets.java:3515
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -30763,10 +30879,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 "Lisa andmeid"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
 msgstr "Lisa andmeid"
@@ -30774,5 +30890,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Keemiline puhastus"
@@ -30780,10 +30896,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 "Lisa andmeid"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -30791,20 +30907,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 "Lisa andmeid"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3548
+#: build/trans_presets.java:3549
 msgid "Tailor"
 msgstr "Õmblustöökoda"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3550
 msgid "Edit Tailor"
 msgstr "Lisa andmeid"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3554
+#: build/trans_presets.java:3555
 msgid "Fabric"
 msgstr "Kangad"
@@ -30812,35 +30928,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 "Lisa andmeid"
 
 #. group "Electronic"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3565
 msgid "Electronic"
 msgstr "Elektroonika"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3566
 msgid "Computer"
 msgstr "Arvutid"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr "Mobiiltelefonid"
@@ -30848,10 +30964,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 "Lisa andmeid"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3587
 msgid "Vacuum Cleaner"
 msgstr "Tolmuimejad"
@@ -30859,35 +30975,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 "Lisa andmeid"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3596
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr "Lisa andmeid"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3602
 msgid "Video"
 msgstr "Video"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:3603
 msgid "Edit Video Shop"
 msgstr "Lisa andmeid"
 
 #. group "Cash"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3609
 msgid "Cash"
 msgstr "Sularaha"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Pank"
@@ -30895,5 +31011,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 "Lisa andmeid"
@@ -30901,10 +31017,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 "Sularahaautomaat"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Rahavahetus"
@@ -30912,5 +31028,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 "Lisa andmeid"
@@ -30918,10 +31034,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 "Lisa andmeid"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr "Kaubamaja"
@@ -30929,10 +31045,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 "Lisa andmeid"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3642
+#: build/trans_presets.java:3643
 msgid "Mall"
 msgstr "Kaubanduskeskus"
@@ -30940,5 +31056,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 "Lisa andmeid"
@@ -30946,35 +31062,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr "Apteek"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
 msgstr "Lisa andmeid"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Lisa andmeid"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
 msgstr "Lisa andmeid"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr "Juveelipood"
@@ -30982,10 +31098,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 "Lisa andmeid"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3679
+#: build/trans_presets.java:3680
 msgid "Erotic"
 msgstr "Erootikakaubad"
@@ -30993,5 +31109,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 "Lisa andmeid"
@@ -30999,5 +31115,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "Lilled"
@@ -31005,10 +31121,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 "Lisa andmeid"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -31016,5 +31132,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 "Lisa andmeid"
@@ -31022,5 +31138,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "Pood isetegijaile"
@@ -31028,10 +31144,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 "Lisa andmeid"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr "Ehituspood"
@@ -31039,10 +31155,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 "Lisa andmeid"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3719
 msgid "Paint"
 msgstr "Värvid"
@@ -31050,5 +31166,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 "Lisa andmeid"
@@ -31056,15 +31172,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
 msgstr "Valmisköögid"
@@ -31072,10 +31188,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 "Lisa andmeid"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3743
+#: build/trans_presets.java:3744
 msgid "Curtain"
 msgstr "Kardinad"
@@ -31083,10 +31199,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 "Lisa andmeid"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3752
+#: build/trans_presets.java:3753
 msgid "Frame"
 msgstr "Raamimiskoda"
@@ -31094,5 +31210,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 "Lisa andmeid"
@@ -31100,15 +31216,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
 msgstr "Paljunduskoda"
@@ -31116,15 +31232,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 "Lisa andmeid"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3778
 msgid "Book Store"
 msgstr "Raamatupood"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3779
 msgid "Edit Book Store"
 msgstr "Lisa andmeid"
@@ -31132,15 +31248,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Reisibüroo"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "Lisa andmeid"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr "Muusikariistad"
@@ -31148,20 +31264,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 "Lisa andmeid"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3800
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "Lisa andmeid"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
 msgstr ""
@@ -31169,10 +31285,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 "Lisa andmeid"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3815
+#: build/trans_presets.java:3816
 msgid "Vending machine"
 msgstr "Müügiautomaat"
@@ -31180,5 +31296,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 "Lisa andmeid"
@@ -31186,180 +31302,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 "Müüdavad kaubad"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "toit"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "joogid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "maiustused"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "suitsud"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr "fotod"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "looma_toit"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "ajalehed"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "mänguasjad"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "templid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "maksedokumendid"
 
 #. 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 "kondoomid"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "tampoonid"
 
 #. 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 "Geograafia"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr "Lisa andmeid"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. 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 "Lisa andmeid"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Asukohad"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "Lisa andmeid"
 
 #. 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"
@@ -31367,10 +31483,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Lisa andmeid"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31378,25 +31494,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "Lisa andmeid"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Lisa andmeid"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr "Maakond"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr "Lisa andmeid"
@@ -31404,5 +31520,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
@@ -31411,10 +31527,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "Lisa andmeid"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "Linn"
@@ -31422,10 +31538,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 "Lisa andmeid"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -31433,35 +31549,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 "Lisa andmeid"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "Lisa andmeid"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Lisa andmeid"
 
 #. 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 ""
@@ -31469,5 +31585,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -31475,10 +31591,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 "Lisa andmeid"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3956
+#: build/trans_presets.java:3957
 msgid "Peak"
 msgstr "Mäetipp"
@@ -31486,10 +31602,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 "Lisa andmeid"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Liustik"
@@ -31497,10 +31613,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 "Lisa andmeid"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -31508,10 +31624,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 "Lisa andmeid"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -31519,5 +31635,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 "Lisa andmeid"
@@ -31525,5 +31641,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Saar"
@@ -31531,10 +31647,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 "Lisa andmeid"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr "Laid"
@@ -31542,15 +31658,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 "Lisa andmeid"
 
 #. group "Nature"
-#: build/trans_presets.java:4005
+#: build/trans_presets.java:4006
 msgid "Nature"
 msgstr "Loodus"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4007
 msgid "Tree"
 msgstr "Üksik puu"
@@ -31559,15 +31675,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 "Lisa andmeid"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "Mets"
@@ -31576,10 +31692,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 "Lisa andmeid"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -31587,5 +31703,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -31593,5 +31709,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -31599,5 +31715,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -31606,30 +31722,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 "Lisa andmeid"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "okasmets"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "lehtmets"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "segamets"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "Lisa andmeid"
@@ -31637,15 +31753,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "Klibu, rusukalle"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr "Mägikarjamaa"
@@ -31653,20 +31769,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 "Mägikarjamaa muutmine"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "Lisa andmeid"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "Nõmm"
@@ -31674,15 +31790,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 "Lisa andmeid"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -31691,40 +31807,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 "Lisa andmeid"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31732,15 +31848,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 "Lisa andmeid"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4098
 msgid "Allotments"
 msgstr "Aiamaa"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "Lisa andmeid"
@@ -31748,25 +31864,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr "Külatanum"
@@ -31774,10 +31890,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 "Lisa andmeid"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4123
 msgid "Common"
 msgstr "Avalik maa"
@@ -31785,20 +31901,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 "Lisa andmeid"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4129
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -31806,5 +31922,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 "Lisa andmeid"
@@ -31812,15 +31928,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -31828,10 +31944,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 "Lisa andmeid"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -31839,40 +31955,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 "Lisa andmeid"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr "Garaažid"
@@ -31880,10 +31996,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 "Lisa andmeid"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4190
+#: build/trans_presets.java:4191
 msgid "Railway land"
 msgstr "Raudtee"
@@ -31891,15 +32007,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 "Lisa andmeid"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "Lisa andmeid"
@@ -31907,55 +32023,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "Lisa andmeid"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
-msgstr "Kivimurd"
+msgstr "Karjäär, lahtine kaevandus"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "Lisa andmeid"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr ""
@@ -31963,5 +32079,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
@@ -31972,5 +32088,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 "Lisa andmeid"
@@ -31978,5 +32094,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Maja number"
@@ -31984,5 +32100,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Maja nimi"
@@ -31991,55 +32107,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 "Tänava nimi"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Riigi kood"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "AT"
 msgstr "AT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "CH"
 msgstr "CH"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "DE"
 msgstr "DE"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "FR"
 msgstr "FR"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "GB"
 msgstr "GB"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "IT"
 msgstr "IT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "US"
 msgstr "US"
@@ -32047,5 +32163,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
@@ -32057,5 +32173,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 "Lisa andmeid"
@@ -32063,35 +32179,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "Nummerdussüsteem"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "paaritu"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "paaris"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr "tähestikuline"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4259
 msgid "Contact"
 msgstr "Kontakt"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4260
 msgid "Edit Contact information"
 msgstr "Lisa andmeid"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4268
+#: build/trans_presets.java:4269
 msgid "Image"
 msgstr "Pilt"
@@ -32101,5 +32217,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 "Liitala muutmine"
@@ -32111,5 +32227,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 "väline osa"
@@ -32117,5 +32233,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 "siseosa"
@@ -32123,5 +32239,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr "Piir"
@@ -32132,5 +32248,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 "Lisa andmeid"
@@ -32138,46 +32254,51 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "Boundary type"
 msgstr "Piiri tüüp"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "administrative"
 msgstr "haldusüksus"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "national"
 msgstr "rahvuslik"
 
 #. 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 "poliitiline"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4296
+#: build/trans_presets.java:4297
 msgid "Administrative level"
 msgstr "Haldusüksuse tase"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:4302
 msgid "Sub area"
 msgstr "Alamala"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4303
 msgid "Administration centre"
 msgstr "Haldusüksuse keskus"
 
+#. 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 "Pöördekeelud"
@@ -32186,5 +32307,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 "Lisa andmeid"
@@ -32192,40 +32313,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 "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -32234,15 +32355,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "teelt"
 
 #. 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 "teele"
@@ -32250,5 +32371,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "Teekond"
@@ -32262,5 +32383,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 "Lisa andmeid"
@@ -32270,5 +32391,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 "teekonna tüüp"
@@ -32276,5 +32397,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
@@ -32284,5 +32405,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 "tee"
@@ -32290,5 +32411,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 "praam"
@@ -32296,5 +32417,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 "suusad"
@@ -32347,9 +32468,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 "jalgsi"
@@ -32357,5 +32478,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 "matkamine"
@@ -32363,5 +32484,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
@@ -32371,5 +32492,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 "ümbersõit"
@@ -32383,6 +32504,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
@@ -32392,5 +32513,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 "sümboolne kirjeldus"
@@ -32402,6 +32523,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 "Võrk"
@@ -32409,5 +32530,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 ""
@@ -32415,5 +32536,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 "planeeritud"
@@ -32421,5 +32542,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 "täiendav"
@@ -32427,5 +32548,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 "ajutine"
@@ -32433,5 +32554,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 "ühendus"
@@ -32439,5 +32560,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 "Värv (hex)"
@@ -32449,15 +32570,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 "teekonna osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4343
+#: build/trans_presets.java:4345
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4344
+#: build/trans_presets.java:4346
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
@@ -32465,5 +32586,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 "peatuspunkt"
@@ -32471,5 +32592,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 "edasisuunaline peatuspunkt"
@@ -32477,5 +32598,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 "tagasisuunaline peatuspunkt"
@@ -32483,5 +32604,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32495,25 +32616,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 ""
@@ -32521,5 +32642,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -32527,5 +32648,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 "Lisa andmeid"
@@ -32534,5 +32655,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr "liige"
@@ -32540,5 +32661,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr "Seotud tänav"
@@ -32546,10 +32667,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 "Lisa andmeid"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4402
+#: build/trans_presets.java:4404
 msgid "house"
 msgstr "maja"
@@ -32744,6 +32865,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 "kasutusest väljas"
@@ -32775,5 +32896,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 "hobused"
@@ -32928,10 +33049,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 "tõke"
@@ -32976,5 +33094,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr ""
@@ -33018,7 +33136,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 "teerada"
@@ -33092,5 +33210,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 "teenused"
@@ -33102,5 +33220,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr ""
@@ -33118,5 +33236,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 ""
@@ -33127,5 +33245,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -33138,5 +33256,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 ""
@@ -33148,5 +33266,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 "jõekallas"
@@ -33158,5 +33276,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "oja"
@@ -33168,5 +33286,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "dokk"
@@ -33356,17 +33474,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 "inimtekkeline"
@@ -33378,5 +33496,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr ""
@@ -33424,9 +33542,27 @@
 #. <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 "raudteepunkt"
+
+#. <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 ""
 
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33443,10 +33579,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 "muu rööbastee"
 
 #. color railover
-#: build/trans_style.java:966
+#: build/trans_style.java:981
 msgid "railover"
 msgstr "ülarelss"
@@ -33474,7 +33610,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 "kasutamata raudtee"
@@ -33509,6 +33645,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 "aeronautika"
@@ -33526,5 +33662,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 "helikopterid"
@@ -33542,5 +33678,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 "kerglennukid"
@@ -33600,8 +33736,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 "köisraudtee"
@@ -33615,5 +33751,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 "suusanõlv lihtne"
@@ -33625,5 +33761,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 "suusanõlv keskmine"
@@ -33635,5 +33771,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 "suusanõlv edasijõudnutele"
@@ -33645,5 +33781,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 "nõlv_ekspert"
@@ -33655,5 +33791,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 "suusanõlv klassita"
@@ -33665,5 +33801,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 "suusanõlv algajale"
@@ -33792,13 +33928,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 "elektrivarustus"
@@ -33809,5 +33945,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 "kai"
@@ -33819,5 +33955,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "torujuhe"
@@ -33933,13 +34069,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 "puhkealad"
@@ -33951,5 +34087,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "paadisadam"
@@ -34023,10 +34159,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 "mugavused"
@@ -34110,11 +34246,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 "autohooldus"
@@ -34450,24 +34586,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 "muud teenused"
@@ -34493,6 +34629,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 "vesi"
@@ -34539,8 +34675,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 "tervishoid"
@@ -34909,34 +35045,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 "pood"
@@ -34992,8 +35128,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 "hotell"
@@ -35069,9 +35205,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 "turism"
@@ -35139,9 +35275,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 "alalooline"
@@ -35208,9 +35344,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 "roheala"
@@ -35221,7 +35357,7 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
-msgstr "kivimurd"
+msgstr "karjäär"
 
 #. <icon src="misc/landmark/mine.png"/>
@@ -35231,5 +35367,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "prügimägi"
@@ -35247,5 +35383,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 "tehisjärv"
@@ -35257,5 +35393,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "kultuurmets"
@@ -35267,5 +35403,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr "garaažid"
@@ -35277,5 +35413,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "taluõu"
@@ -35294,5 +35430,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 "kaubandus"
@@ -35304,5 +35440,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "tööstus"
@@ -35314,5 +35450,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -35324,5 +35460,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -35334,5 +35470,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -35377,7 +35513,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 "militaarala"
@@ -35389,5 +35525,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "kalmistu"
@@ -35398,5 +35534,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "mäetipp"
@@ -35409,5 +35545,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 "liustik"
@@ -35419,5 +35555,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 "vulkaan"
@@ -35459,8 +35595,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 "looduslik"
@@ -35472,5 +35608,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "põõsastik"
@@ -35482,5 +35618,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "nõmm"
@@ -35492,5 +35628,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr "metsaala"
@@ -35502,5 +35638,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "muda"
@@ -35512,5 +35648,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "rand"
@@ -35570,8 +35706,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 "marsruut"
@@ -35650,12 +35786,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 "piir"
@@ -35771,11 +35907,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 "koht"
@@ -35787,5 +35923,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
 msgstr ""
@@ -35821,6 +35957,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"
@@ -36061,9 +36197,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"
@@ -36071,44 +36206,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 "Open Aerial Map"
-
-#. <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 "Yahoo Sat"
-
-#. <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 ""
@@ -36116,11 +36238,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 ""
@@ -36128,73 +36249,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 "OpenCycleMap"
 
 #. <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"
-msgstr "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>
@@ -36202,29 +36350,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 "Tänavad 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>
@@ -36232,13 +36395,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>
@@ -36246,13 +36409,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>
@@ -36260,13 +36423,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>
@@ -36276,273 +36439,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 "Tšehhi CUZK:KM"
 
 #. <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 "Tšehhi UHUL:ORTOFOTO"
 
 #. <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 Maps"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr "7. seeria (OS7)"
 
 #. <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 "NPE Maps (Tim)"
-
-#. <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 "7. seeria (OS7)"
-
-#. <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 "MLIT Jaapan (ORTHO)"
-
-#. <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 "MLIT Jaapan (ORTHO01)"
-
-#. <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 "MLIT Jaapan (ORTHO02)"
-
-#. <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 "MLIT Jaapan (ORTHO03)"
-
-#. <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 "Lodi - Itaalia"
 
 #. <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 "Sitsiilia - Itaalia"
 
 #. <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 "PCN 2006 - Itaalia"
 
 #. <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>
@@ -36550,35 +37536,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 ""
@@ -36590,9 +37592,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 ""
@@ -37956,5 +38959,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM peatatakse muudatuste aktiveerimiseks."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
@@ -38084,4 +39087,5 @@
 "JOSM preferences."
 msgstr ""
+"Asenda esialgne valge taustavärv JOSMi eelistustes määratud taustavärviga."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38990,4 +39994,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
@@ -39573,18 +40594,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 ""
@@ -40256,16 +41277,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 ""
@@ -40319,80 +41339,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
@@ -40400,35 +41454,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
@@ -40436,8 +41504,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
@@ -40447,11 +41523,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 ""
 
@@ -41831,9 +42938,17 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr "Laen alla muutustekogumit"
+msgstr "Laadin alla muutustekogumit"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
 #, java-format
 msgid "Revert changeset #{0}"
+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 ""
 
@@ -42011,4 +43126,24 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "Jah, kustuta sõlmed"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Kustuta sõlmed väljaspool allalaetud andmete ulatust"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "Ei, katkesta"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "Kas soovid neid kustutada sellegipoolest?"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "Kas kustutan sõlmed väljaspool andmete ala?"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42069,9 +43204,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 ""
 
@@ -42756,9 +43886,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 ""
@@ -42853,17 +43983,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 "Tühista valitud rollid või kustuta valitud liikmed"
 
-#: ../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 ""
@@ -43584,4 +44714,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
@@ -43603,25 +44749,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 "Ava 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 ""
 
@@ -43681,6 +44813,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 ""
 
@@ -43798,5 +44960,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 ""
@@ -43810,5 +44972,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 ""
@@ -43823,12 +44985,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 ""
 
@@ -44132,5 +45308,5 @@
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Vali teekonnapunkt kaardi liigutamiseks"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
@@ -44141,4 +45317,6 @@
 msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
+"Otsing teekonnapunkti järgi. Teekonnapunkti vaatamiseks kliki ja liiguta "
+"kaarti."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
@@ -44162,2 +45340,52 @@
 msgid "Drive a race car on this layer"
 msgstr "Juhi võistlusautot sellel kihil"
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "Open Aerial Map"
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "NPE Maps (Tim)"
+
+#~ msgid "NPE Maps"
+#~ msgstr "NPE Maps"
+
+#~ msgid "Overlapping areas"
+#~ msgstr "Kattuvad alad"
+
+#~ msgid "Info about Element"
+#~ msgstr "Info elemendi kohta"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta."
+
+#~ msgid "Object history"
+#~ msgstr "Objekti ajalugu"
+
+#~ msgid "MLIT Japan (ORTHO)"
+#~ msgstr "MLIT Jaapan (ORTHO)"
+
+#~ msgid "MLIT Japan (ORTHO01)"
+#~ msgstr "MLIT Jaapan (ORTHO01)"
+
+#~ msgid "MLIT Japan (ORTHO02)"
+#~ msgstr "MLIT Jaapan (ORTHO02)"
+
+#~ msgid "MLIT Japan (ORTHO03)"
+#~ msgstr "MLIT Jaapan (ORTHO03)"
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Yahoo Sat"
+#~ msgstr "Yahoo Sat"
+
+#~ msgid "Inspect"
+#~ msgstr "Vaata andmeid"
+
+#~ msgid "Cannot open {0} file because no suitable file importer is available."
+#~ msgid_plural ""
+#~ "Cannot open {0} files because no suitable file importer is available."
+#~ msgstr[0] ""
+#~ "Ei suuda avada {0} faili, sest selleks ei ole saadaval sobivat importijat."
+#~ msgstr[1] ""
+#~ "Ei suuda avada {0} faili, sest selleks ei ole saadaval sobivat importijat."
Index: /applications/editors/josm/i18n/po/eu.po
===================================================================
--- /applications/editors/josm/i18n/po/eu.po	(revision 26721)
+++ /applications/editors/josm/i18n/po/eu.po	(revision 26722)
@@ -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: 2011-07-19 17:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -35,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-09-02 19:20+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:58+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -44,6 +26,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
@@ -68,8 +50,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
@@ -81,7 +63,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
@@ -95,8 +77,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
@@ -108,5 +91,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
@@ -116,6 +98,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
@@ -129,10 +111,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"
@@ -168,14 +151,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
@@ -186,7 +169,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
@@ -202,6 +185,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
@@ -211,5 +194,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
@@ -393,8 +376,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
@@ -408,6 +391,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
@@ -419,6 +402,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
@@ -433,6 +416,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
@@ -454,7 +437,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
@@ -471,5 +456,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 "Utzi"
@@ -480,4 +465,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 "Aukera ezazu jada igota dagoen nodo, bide edota erlazio bat gutxienez."
@@ -538,4 +524,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
@@ -584,5 +571,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
@@ -600,4 +587,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
@@ -618,5 +606,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
@@ -634,4 +622,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
@@ -663,8 +652,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
@@ -693,5 +682,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 "datuak"
@@ -760,5 +749,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 "Aldaketa multzo berriak itxi"
@@ -778,6 +767,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
@@ -858,9 +847,10 @@
 msgstr "Aukeratu ezazu kopiatzeko zerbait"
 
-#: ../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 ""
@@ -917,13 +907,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
@@ -935,5 +925,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
@@ -953,14 +943,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 "Gainidatzi"
 
 #: ../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 "Fitxategia existitzen da. Gainidatzi?"
@@ -1146,5 +1136,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}"
@@ -1218,12 +1208,26 @@
 msgstr "Esportatu GPX fitxategia"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Objektuaren historia"
-
-#: ../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 "Historia"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "OSM-ko bide, nodo eta erlazioen historiaren informazioa erakutsi."
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:46
@@ -1268,5 +1272,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 "Ados"
@@ -1293,12 +1297,24 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20
-msgid "Info about Element"
-msgstr "Elementuaren informazioa"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Erakutsi OSM-ko nodo, bide eta erlazioen objektu informazioa."
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
@@ -1319,6 +1335,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."
@@ -1329,21 +1348,24 @@
 "Aukeratutako bideek deskargatutako ingurunetik kanpoko nodoak dituzte."
 
-#: ../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 "Hau dela eta, zenbait nodo nahi gabe ezabatzea gertatu daiteke."
 
-#: ../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 "Jarraitzeko ziur zaude?"
 
-#: ../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 "Mesedez, eten ez bazaude ziur"
 
-#: ../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 "Ez da ebakidurarik aurkitu. Ez da ezer aldatu."
@@ -1351,33 +1373,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 "Aldaketak desegiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr "Bikoiztutako nodoak kendu dira"
 
-#: ../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 "Ebakidura guztietan nodoa gehituta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr "Elkartu poligono berriak"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr "Ezabatu erlazioak"
 
-#: ../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 "Barne-multipoligono baten parte ez diren bideak ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr "Elkarren gainean dauden azalerak batu egin dira"
 
-#: ../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 "
@@ -1387,23 +1409,23 @@
 "ezazu ez direla erroreak gehitu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "Etiketa gatazkak konpondu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr "Bideak zatitan banatu"
 
-#: ../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 "
@@ -1411,19 +1433,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 "Erlazioetatik elementua ezabatua izan da"
 
 #. 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 "Barne bideetatik etiketak kendu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr "Azalera_gehitu funtzioa"
@@ -1634,4 +1656,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
@@ -1651,8 +1674,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 "gora"
@@ -1672,4 +1696,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
@@ -1689,8 +1714,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 "behera"
@@ -1772,15 +1798,22 @@
 #: ../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] ""
-"Ezin izan dugu {0} fitxategia ireki, ez dugulako inportatzeko tresna "
-"egokirik."
 msgstr[1] ""
-"Ezin izan ditugu {0} fitxategi ireki, ez dugulako inportatzeko tresna "
-"egokirik."
-
-#: ../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>"
@@ -1789,9 +1822,9 @@
 "bat.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1800,5 +1833,5 @@
 msgstr[1] "Fitxategi hauek irekitzen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1934,7 +1967,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
@@ -2109,5 +2142,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 "Gorde"
@@ -2123,30 +2156,30 @@
 msgstr "{0} fitxategia existitzen da jada. Gainidatzi?"
 
-#: ../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 "Ez da esportatzailerik aurkitu! Ez da ezer gorde."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Dokumentu hutsa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "Gorde edonola"
 
-#: ../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 "Dokumentuak ez dauka daturik."
 
 #. 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 "Gatazkak"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "Gatazkak baztertu eta gorde"
 
-#: ../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 "
@@ -2156,13 +2189,13 @@
 "baztertuko balira lez. Jarraitu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "OSM fitxategia gorde"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "GPX fitxategia gorde"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "Geruza gorde"
@@ -2217,5 +2250,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
@@ -2225,55 +2258,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 "Itxi"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Bidea erraztu"
 
-#: ../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 "Ezabatu bidetik beharrezkoak ez diren nodoak"
 
-#: ../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 "Bai, ezabatu nodoak"
-
-#: ../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 "Ezabatu deskargatutako datu inguruneetatik kanpoko nodoak"
-
-#: ../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 "Ez, bertan behera utzi"
-
-#: ../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 "Utzi eragiketa"
-
-#: ../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 "Edonola ere ezabatu nahi dituzu?"
-
-#: ../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 "Datu inguruneetatik kanpoko nodoak ezabatu?"
-
-#: ../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 "Mesedez, aukera ezazu gutxienez bide bat sinplifikatzeko."
 
-#: ../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
@@ -2284,10 +2284,16 @@
 msgstr "Bai"
 
-#: ../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 "Sinplifikatu aukeratutako bide guztiak"
 
-#: ../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 "Utzi eragiketa"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2297,10 +2303,10 @@
 "{0} bide daude aukeratuta. Ziur zaude denak sinplifikatu nahi dituzula?"
 
-#: ../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 "Bideak sinplifikatu?"
 
-#: ../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
@@ -2310,5 +2316,5 @@
 msgstr[1] "{0} bide sinplifikatu"
 
-#: ../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)"
@@ -2371,5 +2377,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 "
@@ -2381,5 +2387,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 "
@@ -2417,38 +2423,38 @@
 msgstr "Hainbat bidek erabilitako adabegiak bikoiztu."
 
-#: ../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 "Nodo hau ez dago beste ezeri lotuta."
 
-#: ../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 "Nodo hauek ez daude beste ezeri lotuta."
 
-#: ../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 "Bide honetako nodo bat ere ez dago beste ezeri lotua."
 
-#: ../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 "Uneko hautaketa ezin daiteke desitsaasteko erabili."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "Batenbat aukeratu:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* etiketadun nodoa edo"
 
-#: ../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 "* Bide batek baino gehiagok erabilitako nodo bat, edo"
 
-#: ../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 ""
 "* Bide batek baino gehiagok erabilitako nodo bat eta bide horietako bat, edo"
 
-#: ../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"
@@ -2457,5 +2463,5 @@
 "bat, edo"
 
-#: ../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."
@@ -2464,5 +2470,5 @@
 "gehiago."
 
-#: ../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"
@@ -2476,14 +2482,14 @@
 "aukeratuak izango dira."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr "Itsatsi gabeko nodoa"
 
-#: ../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 "Bikoiztu {0} nodoetan"
 
-#: ../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"
@@ -2491,4 +2497,21 @@
 msgstr[0] "Bikoiztu nodo {0} {1} nodotan."
 msgstr[1] "Bikoiztu {0} nodo {1} nodotan."
+
+#: ../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
@@ -2588,10 +2611,10 @@
 msgstr "Aukeraketa hutsik dago"
 
-#: ../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 "Datuak kargatu"
 
-#: ../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 ""
@@ -2599,5 +2622,5 @@
 "guztiak"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2608,5 +2631,5 @@
 "dira.<br>Hau konpondu behar duzu lehenbizi.</html>"
 
-#: ../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
@@ -2614,5 +2637,5 @@
 msgstr "Kargatzeko aldaketarik ez."
 
-#: ../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 "Ez dago kargatzeko ezer. Aurretik datu batzuk lor itzazu."
@@ -3099,8 +3122,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
@@ -3484,5 +3507,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 "Bilatu"
@@ -3727,5 +3750,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 "Bestelakoak"
@@ -3872,26 +3895,26 @@
 msgstr "Ezin izan da konpondu ebatzita ez zegoen gatazka bat."
 
-#: ../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 ""
 "Gutxienez objektu bat beharko duzu ezabatzeko, zeure bilduman ez dago ezer"
 
-#: ../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 "{0} nodoa ezabatu"
 
-#: ../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 "{0} bidea ezabatu"
 
-#: ../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 "{0} erlazioa ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
 #, java-format
 msgid "Delete {0} object"
@@ -3900,5 +3923,5 @@
 msgstr[1] "Ezabatu {0} objektuak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} node"
@@ -3907,5 +3930,5 @@
 msgstr[1] "Ezabatu {0} nodoak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -3914,5 +3937,5 @@
 msgstr[1] "Ezabatu {0} bideak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -3921,13 +3944,15 @@
 msgstr[1] "Ezabatu {0} erlazioak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:188
 #, java-format
 msgid "Deleted ''{0}''"
 msgstr "''{0}'' ezabatu da"
 
-#. 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 "Konfirmazioa ezabatu"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:431
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3939,14 +3964,5 @@
 "ditzaketelako.<br>Ezabatzea nahi al dituzu?"
 
-#: ../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 "Konfirmazioa ezabatu"
-
-#. 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 "
@@ -4164,4 +4180,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}''"
@@ -4169,19 +4186,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 "Longitudearen ''{0}'' balio ilegalak"
 
-#: ../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 "Kontuz: huts egin du hobespenak ''{0}'' gordetzean"
 
-#: ../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 "Konfigurazio fitxategian malformazioa {0} lerroetan"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4192,5 +4210,5 @@
 "ez da direktorio bat."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4201,5 +4219,5 @@
 "direktorioa ez da direktorio bat.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4210,5 +4228,5 @@
 "hobespen direktorioa sortzean: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4219,5 +4237,5 @@
 "hobespenen direktorioa sortzean: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4227,5 +4245,5 @@
 "fitxategi bat sortzen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4236,5 +4254,5 @@
 "fitxategiagatik."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4245,5 +4263,5 @@
 "fitxategia jatorrizkora berrezartzeak: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4254,5 +4272,5 @@
 "da <br>{0}<br>n eta lehenetsitako hobespen fitxategia sortzen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4261,5 +4279,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}"
@@ -4333,20 +4351,20 @@
 msgstr "Proiektatutako koordenatuak"
 
-#: ../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 "H"
 
-#: ../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 "I"
 
-#: ../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 "M"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4363,5 +4381,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}."
@@ -4369,5 +4387,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}."
@@ -4387,5 +4405,5 @@
 msgstr "ID = 0 den jatorrizko bat ezin da ikusezina izan"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346
 #, java-format
 msgid ""
@@ -4394,5 +4412,5 @@
 "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817
 #, java-format
 msgid ""
@@ -4461,5 +4479,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 "
@@ -4469,5 +4487,5 @@
 "bestea ez"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952
 #, java-format
 msgid ""
@@ -4480,5 +4498,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"
@@ -4501,6 +4519,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"
@@ -4846,5 +4864,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 ""
@@ -4872,4 +4890,9 @@
 msgid "Running test {0}"
 msgstr "{0} testa exekutatzen"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/ChangePropertyKeyCommand.java:74
@@ -4925,9 +4948,36 @@
 msgstr "Bide gurutzatuak"
 
-#: ../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 ""
@@ -4935,63 +4985,63 @@
 "gehiago."
 
-#: ../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 "Nodo bikoiztuak"
 
-#: ../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 "Nodo bikoiztuak autobideetan"
 
-#: ../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 "Nodo bikoiztuak trenbideetan"
 
-#: ../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 "Nodo bikoiztuak ibaietan"
 
-#: ../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 "Nodo bikoiztuak mugetan"
 
-#: ../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 "Nodo bikoiztuak argindar-lineetan"
 
-#: ../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 "Nodo bikoiztuak elementu naturaletan"
 
-#: ../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 "Nodo bikoiztuak eraikinetan"
 
-#: ../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 "Nodo bikoiztuak lur-erabileretan"
 
-#: ../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 "Beste nodo bikoiztu batzuk"
 
-#: ../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 "Kokapen bera duten nodoak"
@@ -5054,54 +5104,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 "Multipoligonoa"
 
-#: ../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 ""
@@ -5135,4 +5185,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."
@@ -5145,29 +5200,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 ""
@@ -5370,7 +5421,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
@@ -5391,7 +5442,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
@@ -5417,5 +5468,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."
@@ -5576,9 +5627,9 @@
 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 "Itxi gabeko bideak."
 
-#: ../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 ""
@@ -5586,40 +5637,40 @@
 "dira."
 
-#: ../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 "{0} mota naturala"
 
-#: ../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 "{0} lur-erabilpen mota"
 
-#: ../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 "{0} zerbitzu mota"
 
-#: ../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} kirol mota"
 
-#: ../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 "{0} turismo mota"
 
-#: ../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 "{0} denda mota"
 
-#: ../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 "{0} aisialdi mota"
 
-#: ../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}"
@@ -5667,7 +5718,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"
@@ -5679,10 +5730,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 "azalera"
 
-#: ../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 "Itxi-gabeko bidea"
@@ -5818,7 +5869,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}]"
@@ -5858,14 +5909,15 @@
 msgstr "Ez erakutsi berriz (aukera gogoratzen du)"
 
-#: ../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 "osatu gabea"
 
 #. 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}"
@@ -5874,6 +5926,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}"
@@ -5881,12 +5933,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 "errepidea"
@@ -5894,17 +5946,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 "trenbidea"
 
-#: ../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 "ubidea"
 
-#: ../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 "lurzorua"
@@ -5913,8 +5965,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
@@ -5925,6 +5977,6 @@
 msgstr[1] "{0} nodo"
 
-#: ../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"
@@ -5933,9 +5985,9 @@
 msgstr[1] "{0} kide"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr "garraio publikoa"
 
-#: ../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
@@ -6041,5 +6093,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 ""
@@ -6287,5 +6339,5 @@
 msgstr "{0} hobespena ezabatu dugu ez bait da jadanik erabiltzen."
 
-#: ../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"
@@ -6293,10 +6345,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 "Ikusi"
 
-#: ../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
@@ -6305,5 +6357,5 @@
 msgstr "Tresnak"
 
-#: ../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
@@ -6311,5 +6363,5 @@
 msgstr "Aurrezarpenak"
 
-#: ../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
@@ -6320,5 +6372,5 @@
 msgstr "Menua: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Audioa"
@@ -6355,5 +6407,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"
@@ -6361,5 +6413,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"
@@ -6518,5 +6570,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
@@ -6701,5 +6753,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
@@ -6709,5 +6761,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"
@@ -6717,5 +6769,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 "Kideak"
@@ -6953,5 +7005,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
@@ -7085,4 +7137,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 "ezabatua"
@@ -7153,6 +7206,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
@@ -7174,6 +7227,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
@@ -7283,5 +7336,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"
@@ -7364,5 +7417,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
@@ -7374,5 +7427,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
@@ -7504,9 +7557,9 @@
 msgstr "Balio-anitzak diren etiketak soilik erakutsi"
 
-#: ../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 "Aukeratutako objektuentzat soilik"
 
-#: ../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."
@@ -7515,18 +7568,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 "Aldaketa-multzoa"
 
-#: ../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
@@ -7534,23 +7587,23 @@
 msgstr "Deskargatu"
 
-#: ../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 "Erakutsi informazioa"
 
-#: ../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 "Aldaketa-multzo bakoitzarentzako web-orri bana ireki"
 
 #. 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
@@ -7558,5 +7611,5 @@
 msgstr "Xehetasunak"
 
-#: ../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 ""
@@ -7575,12 +7628,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
@@ -7627,5 +7680,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
@@ -7803,19 +7856,13 @@
 "<p></html>"
 
-#: ../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 "Historia"
-
-#: ../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 "Historiadun objektua"
 
-#: ../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
@@ -7825,10 +7872,10 @@
 msgstr "Birkargatu"
 
-#: ../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
@@ -7840,149 +7887,140 @@
 msgstr "Erakutsi"
 
-#: ../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 "Aukeratutako objektuen historia erakutsi"
 
-#: ../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 "Objektuen informazio aurreratua"
 
-#: ../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; "
-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}"
+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
-#, 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
+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 "<objektu berria>"
 
-#: ../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"
+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 "; 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}"
+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: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 ""
@@ -7992,5 +8030,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 ""
@@ -7999,5 +8037,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 ""
@@ -8007,5 +8045,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -8014,22 +8052,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 ""
@@ -8047,5 +8085,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
@@ -8057,10 +8095,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
@@ -8137,5 +8175,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 "Erakutsi/Ezabatu"
@@ -8154,5 +8192,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 "Aktibatu"
@@ -8186,9 +8224,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 "Aukeratutako geruza lerro bat gorantz mugitu."
 
-#: ../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 "Aukeratutako geruza lerro bat beherantz mugitu."
@@ -8261,5 +8299,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"
@@ -8302,24 +8340,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 "Erlazioak"
 
-#: ../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 "Erlazio guztien zerrenda ireki."
 
-#: ../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 "Aukeratutako erlazioarentzat editore bat ireki"
 
-#: ../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 "Aukeratutako erlazioa ezabatu"
 
-#: ../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
@@ -8328,5 +8366,5 @@
 msgstr "Erlazio berria sortu"
 
-#: ../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
@@ -8334,133 +8372,125 @@
 msgstr "Erlazio honen kopia bat sortu eta beste edizio-leiho batean ireki"
 
-#: ../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 "Erlazioa aukeratu"
 
-#: ../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 "Erlazioak: {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 "Aukeraketa"
 
-#: ../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 ""
 
-#: ../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 "Aukeraketa: {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
@@ -8544,10 +8574,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 ""
 
@@ -8895,4 +8928,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" />
@@ -8948,8 +8986,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" />
@@ -9734,5 +9768,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
@@ -9743,179 +9777,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
@@ -10334,9 +10369,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 "Propietateak gehitu"
 
-#: ../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."
@@ -10345,14 +10380,14 @@
 msgstr[1] "Horrela {0} objekturaino aldatuko dira."
 
-#: ../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
@@ -10364,5 +10399,5 @@
 msgstr "<ezberdina>"
 
-#: ../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?"
@@ -10370,13 +10405,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 ""
@@ -10385,5 +10420,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
@@ -10393,5 +10428,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."
@@ -10400,31 +10435,31 @@
 msgstr[1] "Horrela {0} objekturaino aldatuko dira."
 
-#: ../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 "Mesedez, aukeratu balio bat"
 
-#: ../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 "Mesedez, aukeratu propietateak editatzea nahi dizkiezun objektuak."
 
-#: ../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 "Propietateak/Partaidetzak"
 
-#: ../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 "Aukeratutako objektuen propietateak"
 
 #. 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"
@@ -10433,63 +10468,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 "Kokapena"
 
-#: ../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 "Propietateak: {0} / Partaidetzak: {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 "Propietateak / Partaidetzak"
 
-#: ../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 "Erlazioa aldatu"
 
-#: ../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 "Erlaziotik ezabatu"
 
-#: ../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 ""
 
-#: ../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 "Propietateak ezabatu"
 
-#: ../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 ""
 
@@ -10975,57 +11034,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 "Ezabatu aukeratutako laster-markak"
 
-#: ../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 "
@@ -11033,10 +11092,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
@@ -11045,15 +11104,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"
@@ -11129,13 +11188,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 ""
 
@@ -11184,7 +11234,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"
@@ -11200,12 +11255,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
@@ -11288,4 +11344,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"
@@ -11323,5 +11381,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 ""
@@ -11346,10 +11404,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 ""
@@ -11357,5 +11415,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 ""
@@ -11363,9 +11421,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 ""
@@ -11447,13 +11505,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}"
@@ -12019,5 +12077,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
@@ -12029,11 +12087,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 ""
@@ -12053,5 +12111,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 ""
@@ -12074,5 +12132,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
@@ -12085,5 +12143,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 ""
@@ -12102,30 +12160,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 "Aldaketak igo"
 
-#: ../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 "
@@ -12136,33 +12194,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}"
@@ -12514,5 +12572,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
@@ -12871,5 +12929,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 ""
@@ -12879,65 +12937,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 ""
@@ -12952,46 +13010,19 @@
 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 ""
-"Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:155
-msgid "(deactivated)"
-msgstr "(desaktibatua)"
-
-#: ../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 "({0}) WMS geruza, automatikoki jaisten {1} zoom mailan"
 
-#: ../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 "({0}) WMS geruza, {1} zoom mailan jaisten"
 
-#: ../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 "Bai, jaitsi irudiak"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:268
-msgid "Invalid URL?"
-msgstr "URL desegokia?"
-
-#: ../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 "Jaitsi ikusgai dauden \"tile\"ak"
 
-#: ../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"
@@ -13000,33 +13031,33 @@
 "bereizmena"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537
 msgid "Change resolution"
 msgstr "Bereizmena aldatu"
 
-#: ../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 "\"Tile\" okerrak berriz kargatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:653
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:607
 msgid "Alpha channel"
 msgstr "Alpha kanala"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:638
 msgid "Save WMS layer to file"
 msgstr "Gorde WMS geruza fitxategian"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:643
 msgid "Save WMS layer"
 msgstr "Gorde WMS geruza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:667
 msgid "Load WMS layer from file"
 msgstr "Kargatu WMS geruza fitxategitik"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:672
 msgid "Load WMS layer"
 msgstr "Kargatu WMS geruza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:729
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:683
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -13034,25 +13065,25 @@
 "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:730
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684
 msgid "File Format Error"
 msgstr "Fitxategiaren formatuan errorea"
 
-#: ../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 "Fitxategia kargatzean errorea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:735
 msgid "Set WMS Bookmark"
 msgstr "WMS laster-marka ezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
 msgid "Automatic downloading"
 msgstr "Jaitsiera automatikoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:827
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
 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}"
@@ -13418,5 +13449,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"
@@ -13611,4 +13645,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 ""
@@ -13754,4 +13789,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"
@@ -13829,8 +13866,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 ""
 
@@ -14182,26 +14215,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 "Menu-izena"
 
-#: ../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 "WMS"
 
-#: ../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"
@@ -14209,49 +14242,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 ""
@@ -14459,5 +14491,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}"
@@ -14593,5 +14625,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
@@ -14659,5 +14691,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 ""
@@ -14683,14 +14715,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 ""
@@ -14729,13 +14761,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 ""
@@ -14880,113 +14912,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 "Jaitsiera kudeatzailea:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180
 msgid "Overlap tiles"
 msgstr "\"Tile\"-en gainjartzea"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181
 msgid "% of east:"
 msgstr "ekialdera % :"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
 msgid "% of north:"
 msgstr "iparraldera %:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197
 msgid "Simultaneous connections"
 msgstr "Aldibereko konexioak"
 
-#: ../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
@@ -14997,55 +15033,55 @@
 msgstr "Berria"
 
-#: ../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 "Mesedez, aukeratu kopiatzeko lerro bat gutxienez."
 
-#: ../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 "Menu-izena (lehenetsia)"
 
-#: ../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 ""
@@ -15623,7 +15659,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 ""
@@ -16171,5 +16209,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 ""
@@ -16178,5 +16216,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 ""
@@ -16216,28 +16254,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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -16247,15 +16285,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 ""
 
-#: ../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 ""
 
-#: ../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
@@ -16265,22 +16303,22 @@
 msgstr[1] "Aldatu {0} objektuak"
 
-#: ../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"
@@ -16342,4 +16380,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 ""
 
@@ -16923,5 +16996,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
@@ -17037,5 +17110,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
@@ -17046,5 +17118,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
@@ -17072,4 +17144,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
@@ -17115,14 +17188,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
@@ -17132,10 +17205,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
@@ -17144,5 +17218,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
@@ -17152,16 +17226,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
@@ -17169,5 +17238,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
@@ -17175,5 +17244,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
@@ -17182,5 +17251,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
@@ -17190,21 +17259,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
@@ -17213,5 +17276,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
@@ -17219,6 +17282,6 @@
 msgstr ""
 
-#: ../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
@@ -17231,8 +17294,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
@@ -17246,5 +17309,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
@@ -17252,5 +17315,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
@@ -17259,6 +17322,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
@@ -17272,6 +17335,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
@@ -17282,5 +17345,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
@@ -17289,5 +17352,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
@@ -17296,52 +17359,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
@@ -17497,4 +17527,32 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+msgid "OSM Server Files PBF compressed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "Koordenatuak:"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "Eman aldaketa-multzoaren IDa"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, fuzzy, java-format
+msgid "Invalid timestamp: {0}"
+msgstr "{0} zerbitzu mota"
+
+#: ../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 "GPS datuak deskargatzen"
+
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
@@ -17514,11 +17572,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
@@ -17535,33 +17586,4 @@
 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 ""
-"Kontuz: WMSaren \"tile\"-eguneraketak huts egin dezake. Mesedez, egiaztatu "
-"zure hobespenen konfigurazioa."
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:149
-#, java-format
-msgid "Warning: The complete URL is ''{0}''."
-msgstr "Kontuz: URL osoa \"{0}\" da."
-
-#: ../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 ""
-"URLaren ''{0}'' proiekzioa eta egungo ''{1}'' proiekzioa ez datoz bat.\n"
-"Koordenatu okerretara eraman gaitzake honek."
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -18300,10 +18322,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
@@ -18313,5 +18335,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
@@ -18320,6 +18342,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 ""
@@ -18354,5 +18376,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18362,5 +18384,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"
@@ -18368,5 +18390,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18375,5 +18397,5 @@
 msgstr ""
 
-#: ../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 ""
@@ -19014,16 +19036,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 "Bideratze-informazioa bideratze-grafo moduan erakusten du."
 
 #. 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 "
@@ -19036,15 +19063,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 "
@@ -19054,5 +19081,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -19061,10 +19088,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 "
@@ -19073,10 +19100,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
 msgstr "WMS irudiak bektorizatzeko laguntza."
 
 #. 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 "
@@ -19085,5 +19112,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."
@@ -19091,5 +19118,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 "
@@ -19099,5 +19126,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 "
@@ -19107,25 +19134,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 "Ezkerrera biratzeko debekua gehitzen die 4 edo 5 bide-multzoei"
 
 #. 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. "
@@ -19134,5 +19161,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 "
@@ -19142,15 +19169,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 "OpenStreetBugs-etik akatsak jaisten ditu"
 
 #. 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"
@@ -19160,5 +19187,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."
@@ -19168,10 +19195,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 "
@@ -19182,5 +19209,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 "
@@ -19191,15 +19218,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic handiaren \"Look and Feel\"-a."
 
 #. 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."
@@ -19208,25 +19235,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 "Aldaketa-multzoak"
 
 #. 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 "
@@ -19236,5 +19263,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 "
@@ -19246,10 +19273,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Provides routing capabilities."
 msgstr "Bideratzaile-gaitasunak ematen ditu"
 
 #. 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 "
@@ -19262,15 +19289,15 @@
 #. 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 "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -19279,5 +19306,5 @@
 
 #. 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 "
@@ -19291,15 +19318,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Make terraced houses out of single blocks."
 msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu"
 
 #. 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). "
@@ -19310,5 +19337,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) "
@@ -19319,10 +19346,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."
@@ -19330,5 +19357,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19339,5 +19366,5 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Allows undeleting object from OSM database"
 msgstr ""
@@ -19346,10 +19373,10 @@
 
 #. 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 "
@@ -19362,5 +19389,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19372,20 +19399,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Elkar-konektaturiko bide luzeen deskarga erraza"
 
 #. 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 "Aukeratu adarkadura ez dute konektaturiko bideak"
 
 #. 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 "
@@ -19552,9 +19579,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 "Erreferentzia"
@@ -19607,6 +19634,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 "Gehienezko abiadura (km/o)"
@@ -19655,9 +19682,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 "Norabide bakarra"
@@ -19707,9 +19734,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 "Zubia"
@@ -19750,9 +19777,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 "Tunela"
@@ -19791,9 +19818,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 "Mozketa"
@@ -19832,9 +19859,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 "Lubeta"
@@ -19873,9 +19900,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 ""
@@ -19961,4 +19988,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"
@@ -19976,8 +20004,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 "Penditza"
@@ -19997,4 +20026,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
@@ -20012,8 +20042,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 ""
@@ -20033,4 +20064,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
@@ -20048,8 +20080,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 ""
@@ -20069,4 +20102,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
@@ -20084,8 +20118,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 ""
@@ -20105,4 +20140,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
@@ -20120,8 +20156,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 ""
@@ -20194,5 +20231,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 "Aurreratze-lekua"
@@ -20224,10 +20261,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 "Zabalera (metroak)"
@@ -20269,9 +20306,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 "Gainazala"
@@ -20296,9 +20333,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 "zolatua"
@@ -20322,9 +20359,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 "zolatu-gabea"
@@ -20348,9 +20385,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 "asfaltua"
@@ -20375,9 +20412,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 "hormigoi"
@@ -20402,9 +20439,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 "metala"
@@ -20424,4 +20461,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
@@ -20430,10 +20468,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 "egurra"
@@ -20457,9 +20495,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 "galtzada-arri zola"
@@ -20484,9 +20522,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 "galtzada-arria"
@@ -20511,9 +20549,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 "hartxintxar"
@@ -20537,9 +20575,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 ""
@@ -20563,9 +20601,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 "trinkotua"
@@ -20589,9 +20627,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 "landare-zolua"
@@ -20616,9 +20654,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 "belarra"
@@ -20643,9 +20681,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 "hondarra"
@@ -20671,10 +20709,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 "lursaila"
@@ -20825,5 +20863,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 "errotonda"
@@ -20977,64 +21015,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
@@ -21110,8 +21148,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"
@@ -21141,8 +21179,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 "banaketa"
@@ -21192,9 +21230,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"
@@ -21237,9 +21275,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"
@@ -21260,7 +21298,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 "nekazal"
@@ -21280,7 +21318,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 "baso"
@@ -21420,61 +21458,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
@@ -21508,10 +21546,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 "ofiziala"
@@ -21543,10 +21581,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 "baimendua"
@@ -21565,11 +21603,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 "Zaldia"
@@ -21587,5 +21625,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 ""
@@ -21606,12 +21644,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 "Motozikleta"
@@ -21629,10 +21667,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 "Automobil"
@@ -21732,6 +21770,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 "Autobidea"
@@ -21739,5 +21777,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 "Autobidearen lotura"
@@ -21757,6 +21795,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 "errepide nagusia"
@@ -21764,5 +21802,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 "errepide nagusiaren lotura"
@@ -21782,6 +21820,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 "lehenengo mailakoa"
@@ -21789,5 +21827,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 "lehenengo mailako errepidearen lotura"
@@ -21807,6 +21845,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 "bigarren mailakoa"
@@ -21826,6 +21864,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 "hirugarren mailakoa"
@@ -21833,5 +21871,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 "sailkapenik gabeko errepidea"
@@ -21845,6 +21883,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 "kalea"
@@ -21852,5 +21890,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 "bizitegi-kalea"
@@ -21891,6 +21929,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 "zerbitzu-bidea"
@@ -21898,5 +21936,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 "gidatutako autobus-bidea"
@@ -21921,7 +21959,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 "eraikitzen"
@@ -21957,11 +21995,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "Ibia"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "Ibia editatu"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "Bideak"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr "Pista"
@@ -21970,35 +22019,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 "Pista editatu"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "Tracktype"
 msgstr "Pista-mota"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade1"
 msgstr "1. gradukoa"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade2"
 msgstr "2. gradukoa"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade3"
 msgstr "3. gradukoa"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade4"
 msgstr "4. gradukoa"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade5"
 msgstr "5. gradukoa"
@@ -22006,10 +22055,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 "MTB eskala"
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:546
+#: build/trans_presets.java:556
 msgid "General access"
 msgstr ""
@@ -22017,5 +22066,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr "Ibilbidea"
@@ -22024,50 +22073,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 "Ibilbidea editatu"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "SAC Scale"
 msgstr "SAC eskala"
 
 #. 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, "
@@ -22076,5 +22125,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 "
@@ -22084,5 +22133,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 "
@@ -22091,5 +22140,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, "
@@ -22098,5 +22147,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, "
@@ -22106,5 +22155,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"
@@ -22112,10 +22161,10 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "excellent"
 msgstr "bikaina"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "good"
 msgstr "ona"
@@ -22123,15 +22172,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 "ertaina"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "bad"
 msgstr "txarra"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "horrible"
 msgstr "oso txarra"
@@ -22154,23 +22203,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 "Gurpil-aulkiak"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:582
+#: build/trans_presets.java:592
 msgid "Ski"
 msgstr "Eskia"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr "Elur-lera"
@@ -22179,5 +22228,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr "Dedikatutako ferra-bidea"
@@ -22185,5 +22234,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 "Dedikatutako ferra-bidea editatu"
@@ -22191,5 +22240,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -22197,10 +22246,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 ""
@@ -22209,6 +22258,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 ""
@@ -22259,27 +22308,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 "pista"
@@ -22288,6 +22337,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 ""
@@ -22296,6 +22345,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 ""
@@ -22304,6 +22353,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 ""
@@ -22312,6 +22361,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 ""
@@ -22320,21 +22369,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 ""
@@ -22342,15 +22391,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 "Dedikatutako bizikleta-bidea"
@@ -22368,11 +22417,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 "Bizikleta-bidea editatu"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr "Oinezkoak"
@@ -22380,5 +22429,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr "Bizikleta-bidea eta oinezkoena bananduta"
@@ -22386,5 +22435,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr "Bizikleta-bidea eta oinezkoena batuta"
@@ -22392,5 +22441,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr "Dedikatutako oinezko-bidea"
@@ -22399,5 +22448,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 "Oinezko-bidea editatu"
@@ -22405,5 +22454,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "Eskailerak"
@@ -22413,10 +22462,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 "Eskailera-bidea editatu"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr ""
@@ -22424,5 +22473,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"
@@ -22430,5 +22479,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr "Autobideko irteera"
@@ -22436,10 +22485,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 "Autobideko irteera editatu"
 
 #. 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
@@ -22448,10 +22497,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 "Zerbitzuak"
@@ -22459,5 +22508,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 "Zerbitzu-gunea editatu"
@@ -22551,42 +22600,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 "Operadorea"
@@ -22595,6 +22644,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 "Komunak"
@@ -22602,5 +22651,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -22608,5 +22657,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 ""
@@ -22614,5 +22663,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "Larrialdietako telefonoa"
@@ -22622,5 +22671,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "Semaforoa"
@@ -22630,5 +22679,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 "Oinezkoen bidegurutze mota"
@@ -22637,6 +22686,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 "kontrolik gabea"
@@ -22645,6 +22694,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 "semaforoa"
@@ -22653,6 +22702,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 "irla"
@@ -22661,6 +22710,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 "markatugabea"
@@ -22669,6 +22718,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 "Zaldien bidegurutzea"
@@ -22677,6 +22726,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 "Bizikleten bidegurutzea"
@@ -22685,11 +22734,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 "Bidegurutze-zaintzailea"
 
 #. 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 "Bidegurutze motaren izena (Erresuma Batua)"
@@ -22697,5 +22746,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 "zebra"
@@ -22703,5 +22752,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 "pelikanoa"
@@ -22709,5 +22758,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 "tukana"
@@ -22715,5 +22764,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 ""
@@ -22721,5 +22770,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 "pegaso"
@@ -22727,5 +22776,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 "tigrea"
@@ -22733,5 +22782,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr "Gelditu"
@@ -22739,5 +22788,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "Errotonda txikia"
@@ -22748,15 +22797,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 "Norabidea"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "clockwise"
 msgstr "erlojuaren norabidea"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:804
 msgid "Pedestrian Crossing"
 msgstr "Oinezkoen pasabidea"
@@ -22765,15 +22814,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 "Pasabidea editatu"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
 msgstr "Izen-mota (Erresuma batua)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr "Trafikoaren arinketa"
@@ -22781,40 +22830,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 "Trafikoaren arinketa editatu"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "bump"
 msgstr "salto"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "chicane"
 msgstr "chicane"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "choker"
 msgstr "estugune"
 
 #. 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 "taula"
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:820
 msgid "Passing Place"
 msgstr "Aurreratze-lekua"
@@ -22822,5 +22871,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 "Aurreratze-lekua editatu"
@@ -22828,5 +22877,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 "Biraketa-zirkulua"
@@ -22836,5 +22885,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 "Hiriaren muga"
@@ -22842,15 +22891,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 "Hiriaren muga-seinalea editatu"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:837
 msgid "Second Name"
 msgstr "Bigarren izena"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:839
 msgid "Speed Camera"
 msgstr "Abiadura radarra"
@@ -22860,5 +22909,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr "Hartxintxar edukiontzia"
@@ -22867,17 +22916,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "Ibia"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "Ibia editatu"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr "Mendatea"
@@ -22885,5 +22923,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 "Mendatea editatu"
@@ -22895,7 +22933,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 "Garaiera"
@@ -22930,18 +22968,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 ""
@@ -22949,5 +22987,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Oztopoak"
@@ -22955,5 +22993,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr "Bolardoa"
@@ -22961,5 +22999,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 "Bolardoa editatu"
@@ -23009,27 +23047,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 "Baimendutako trafikoa"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:876
 msgid "Cycle Barrier"
 msgstr "Bizikletentzako oztopoa"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:884
+#: build/trans_presets.java:886
 msgid "Block"
 msgstr "Blokea"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:895
 msgid "Cattle Grid"
 msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena)"
@@ -23037,10 +23075,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 "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena) editatu"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr "Autobusentzako tranpa"
@@ -23048,15 +23086,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:910
 msgid "Spikes"
 msgstr "Arantzak"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:911
 msgid "Edit Spikes"
 msgstr "Arantzak editatu"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:922
 msgid "Toll Booth"
 msgstr "Ordainlekua"
@@ -23064,5 +23102,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 "Ordainlekua editatu"
@@ -23070,10 +23108,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "Muga-kontrola"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "Muga-kontrola editatu"
@@ -23082,5 +23120,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "Heskai"
@@ -23089,24 +23127,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr "Hesia"
 
-#. <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 "postea"
+
+#. 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 "Horma"
@@ -23114,5 +23171,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "Harresia"
@@ -23121,5 +23178,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 "Euste-horma"
@@ -23130,15 +23187,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:972
 msgid "Entrance"
 msgstr "Sarrera"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:973
 msgid "Edit Entrance"
 msgstr "Sarrera editatu"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr "Atea"
@@ -23146,50 +23203,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 "Atea editatu"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "Hesia"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "Hesia editatu"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1009
 msgid "Hampshire Gate"
 msgstr "Sare-metalikodun atea"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1010
 msgid "Edit Hampshire Gate"
 msgstr "Sare-metalikodun atea editatu"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1021
 msgid "Bump Gate"
 msgstr "Kolpe-atea (kolpe batekin irekitzen diren ateak)"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1022
 msgid "Edit Bump Gate"
 msgstr "Kolpe-atea (kolpe batekin irekitzen diren ateak) editatu"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1033
 msgid "Kissing Gate"
 msgstr "Ate-birakorra"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1034
 msgid "Edit Kissing Gate"
 msgstr "Ate-birakorra editatu"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
 msgstr "Eskailera (hesi edo langa gainetik pasatzeko)"
@@ -23197,25 +23254,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 "Eskailera (hesi edo langa gainetik pasatzeko)  editatu"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1052
 msgid "Turnstile"
 msgstr "Tornua"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1053
 msgid "Edit Turnstile"
 msgstr "Tornua editatu"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1061
 msgid "Sally Port"
 msgstr "Ate-bikoitza"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1062
 msgid "Edit Sally Port"
 msgstr "Ate-bikoitza editatu"
@@ -23225,6 +23282,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 "Ura"
@@ -23232,5 +23289,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "Isurbidea"
@@ -23238,10 +23295,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 "Isurbidea editatu"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr "Erretena"
@@ -23249,10 +23306,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 "Erretena editatu"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1095
 msgid "Stream"
 msgstr "Errekastoa"
@@ -23260,10 +23317,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 "Errekastoa editatu"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "Kanala"
@@ -23271,10 +23328,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 "Kanala editatu"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "Ibaia"
@@ -23284,5 +23341,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 "Ibaia editatu"
@@ -23290,5 +23347,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Iturburua"
@@ -23296,20 +23353,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 "Iturbura editatu"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Ur-jauzia"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Ur-jauzia editatu"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena)"
@@ -23317,10 +23374,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 "Presa (txikia - ibaiaren bidea pixka bat oztopatzen duena) editatu"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Presa"
@@ -23328,10 +23385,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 "Presa editatu"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
 msgstr ""
@@ -23339,5 +23396,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 ""
@@ -23347,15 +23404,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1159
 msgid "Basin"
 msgstr "Arroa"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1160
 msgid "Edit Basin Landuse"
 msgstr "Arroa editatu"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "Urtegia"
@@ -23363,15 +23420,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 "Urtegia editatu"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1172
 msgid "Covered Reservoir"
 msgstr "Estalitako urtegia"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1173
 msgid "Edit Covered Reservoir"
 msgstr "Estalitako urtegia editatu"
@@ -23379,20 +23436,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 "Urazala editatu"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "Lurrazala"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "Lurrazala editatu"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Kostaldea"
@@ -23400,10 +23457,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 "Kostaldea editatu"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "Ibaiertza"
@@ -23412,5 +23469,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 "Ibaiertza editatu"
@@ -23418,5 +23475,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "Hezegunea"
@@ -23427,15 +23484,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 "Hezegunea editatu"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "zingira"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr "zingira"
@@ -23448,40 +23505,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 "padura"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr "ihitoki"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr "gatz-lurra"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr "marea-gunea"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "mangladia"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "Lokatza"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Lokatza editatu"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Hondartza"
@@ -23489,20 +23546,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 "Hondartza editatu"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Badia"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Badia editatu"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "Itsaslabarrak"
@@ -23510,15 +23567,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 "Itsaslabarrak editatu"
 
 #. 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 "Ferry terminala"
@@ -23526,20 +23583,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 "Ferry terminala editatu"
 
 #. 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 ""
@@ -23625,26 +23682,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 "bizikleta"
 
 #. 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 "Ferry-bidea"
@@ -23652,5 +23709,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 "Ferrya editatu"
@@ -23659,15 +23716,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Kirol-portua"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "Kirol-portua editatu"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "Ontziralekua"
@@ -23675,10 +23732,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 "Ontzilarekua editatu"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr "Esklusa"
@@ -23687,5 +23744,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 "Biratze-puntua"
@@ -23695,5 +23752,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr "Arrapala"
@@ -23703,10 +23760,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 "Arrapala editatu"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1282
 msgid "Boatyard"
 msgstr "Ontziola"
@@ -23714,10 +23771,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 "Ontziola editatu"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1289
 msgid "Dock"
 msgstr "Moila"
@@ -23725,20 +23782,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 "Moila editatu"
 
 #. group "Transport"
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1298
 msgid "Transport"
 msgstr "Garraioa"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1299
 msgid "Railway"
 msgstr "Trenbidea"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "Trena"
@@ -23746,5 +23803,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 "Trena editatu"
@@ -23774,7 +23831,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 "Zabalera (mm)"
@@ -23790,8 +23847,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 "Motak"
@@ -23805,8 +23862,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 "yarda"
@@ -23820,8 +23877,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 "hildako-bidea"
@@ -23835,8 +23892,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 "Adarra"
@@ -23849,8 +23906,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 "Elektrifikatua"
@@ -23863,8 +23920,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 "kontaktu-bidea"
@@ -23893,4 +23950,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
@@ -23925,12 +23989,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
@@ -23948,9 +24013,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 "Tentsioa"
@@ -23963,8 +24028,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 "Frekuentzia (Hz)"
@@ -23977,8 +24042,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 "16.7"
@@ -23986,10 +24051,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1313
 msgid "Narrow Gauge Rail"
 msgstr "Trenbide estua"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:1314
 msgid "Edit Narrow Gauge Rail"
 msgstr "Trenbide estua editatu"
@@ -23997,5 +24062,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "Monoraila"
@@ -24003,5 +24068,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 "Monoraila editatu"
@@ -24009,10 +24074,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1337
 msgid "Preserved"
 msgstr "Mantenduta"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1338
 msgid "Edit Preserved Railway"
 msgstr "Trenbide historikoa editatu"
@@ -24020,10 +24085,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1349
 msgid "Light Rail"
 msgstr "Tren-arina"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1350
 msgid "Edit Light Rail"
 msgstr "Tren-arina editatu"
@@ -24031,10 +24096,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "Metroa"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "Metroa editatu"
@@ -24042,10 +24107,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "Tranbia"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr "Tranbia editatu"
@@ -24053,5 +24118,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr "Autobusarentzako bidea"
@@ -24059,5 +24124,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 "Autobusarentzako bidea editatu"
@@ -24066,10 +24131,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "Erabilpenik gabeko trenbidea"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "Erabilpenik gabeko trenbidea editatu"
@@ -24078,10 +24143,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 "Aukerako motak"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1411
 msgid "Abandoned Rail"
 msgstr "Utzitako trenbidea"
@@ -24090,5 +24155,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr "Trenbide-pasagunea"
@@ -24097,5 +24162,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr "Pasagunea"
@@ -24105,5 +24170,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr "Pasabide mota"
@@ -24111,5 +24176,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr "Biraketa-plataforma"
@@ -24118,5 +24183,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 "Bidearen topea"
@@ -24125,10 +24190,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Erremonte"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "Teleaulkia"
@@ -24136,5 +24201,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 "Teleaulkia editatu"
@@ -24156,12 +24221,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 "Erreferentzia zenbakia"
@@ -24187,14 +24252,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 ""
@@ -24212,10 +24277,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 ""
@@ -24223,5 +24288,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 ""
@@ -24231,6 +24296,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 ""
@@ -24238,5 +24303,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "Teleskia"
@@ -24244,5 +24309,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 "Teleskia editatu"
@@ -24250,5 +24315,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "Telekabina"
@@ -24256,10 +24321,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 "Telekabina editatu"
 
 #. 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 ""
@@ -24267,5 +24332,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr "Gondola"
@@ -24273,10 +24338,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 "Gondola editatu"
 
 #. 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 ""
@@ -24284,5 +24349,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24290,10 +24355,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 ""
@@ -24301,5 +24366,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24307,5 +24372,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 ""
@@ -24313,5 +24378,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24319,5 +24384,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 ""
@@ -24325,5 +24390,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24331,5 +24396,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 ""
@@ -24337,5 +24402,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24343,5 +24408,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 ""
@@ -24349,5 +24414,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24355,5 +24420,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 ""
@@ -24361,5 +24426,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24367,5 +24432,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24375,5 +24440,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24382,5 +24447,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"
@@ -24388,5 +24453,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24395,5 +24460,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"
@@ -24411,6 +24476,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 "Aparkalekua"
@@ -24419,5 +24484,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 "Aparkalekua editatu"
@@ -24425,5 +24490,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 "hainbat solairuduna"
@@ -24431,5 +24496,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 "kanpoan"
@@ -24437,10 +24502,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 "lurrazpian"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr "Aparkatu eta gidatu"
@@ -24451,7 +24516,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 "Ordainpekoa"
@@ -24459,25 +24524,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1595
 msgid "Capacity (overall)"
 msgstr "Gaitasuna (orotara)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1596
 msgid "Spaces for Disabled"
 msgstr "Gutxituentzako lekuak"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1597
 msgid "Spaces for Women"
 msgstr "Emakumeentzako lekuak"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1598
 msgid "Spaces for Parents"
 msgstr "Gurasoentzako lekuak"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1599
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Beste edukiera batzuentzako Wikia ikusi: [types]=*"
@@ -24485,5 +24550,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "Erregaia"
@@ -24493,5 +24558,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 "Erregaia editatu"
@@ -24504,117 +24569,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 "Agip"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Aral"
 msgstr "Aral"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Avia"
 msgstr "Avia"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "BP"
 msgstr "BP"
 
 #. 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 "Esso"
 
 #. 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 "OMV"
 
 #. 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 "Q8"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Repsol"
 msgstr "Repsol"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Shell"
 msgstr "Shel"
 
 #. 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 "Statoil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Tamoil"
 msgstr "Tamoil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Texaco"
 msgstr "Texaco"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Total"
 msgstr "Total"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Independent"
 msgstr ""
@@ -24707,48 +24772,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 "Irekiera-ordutegia"
@@ -24839,47 +24904,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 "24/7"
@@ -24971,47 +25036,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 "Astelehenetik ostiralera 08:30-20:00"
@@ -25081,126 +25146,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:"
-#: build/trans_presets.java:1615
 msgid "Fuel types:"
 msgstr "Erregai motak"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1615
 msgid "Diesel"
 msgstr "Diesela"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1616
 msgid "Bio Diesel"
 msgstr "Biodiesela"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1617
+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"
-#: build/trans_presets.java:1619
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Kamioi handientzako diesela"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1619
 msgid "Octane 91"
 msgstr "91 oktano"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1620
 msgid "Octane 95"
 msgstr "95 oktano"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1621
 msgid "Octane 98"
 msgstr "98 oktano"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1622
 msgid "Octane 100"
 msgstr "100 oktano"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1623
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (%10eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1624
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (%85eko etanol nahastea)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1625
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPF (Petroliotik likidotutako gasa)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1626
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Konprimitutako Gas Naturala)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1627
+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 ""
@@ -25208,5 +25273,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -25214,20 +25279,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 "Garbiketa"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "Autoen garbiketa editatu"
@@ -25235,5 +25300,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr "Auto kontzesionarioa"
@@ -25241,5 +25306,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 "Auto kontzesionarioa editatu"
@@ -25247,20 +25312,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 "Konponketa"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "Autoen konponketa editatu"
 
 #. 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 ""
@@ -25268,5 +25333,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 ""
@@ -25310,15 +25375,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 "Telefono zenbakia"
@@ -25343,14 +25408,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 ""
@@ -25378,15 +25443,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 ""
@@ -25411,14 +25476,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 ""
@@ -25428,6 +25493,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 "Alokairua"
@@ -25436,10 +25501,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 "Alokairuko autoa editatu"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr "Partekatzea"
@@ -25447,5 +25512,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 "Auto-partekatzea editatu"
@@ -25454,16 +25519,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 "Edukiera"
 
 #. 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 ""
@@ -25471,25 +25536,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"
@@ -25497,5 +25562,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25503,5 +25568,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25509,5 +25574,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25518,6 +25583,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 ""
@@ -25525,35 +25590,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 ""
@@ -25563,6 +25628,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 "Arropak"
@@ -25570,10 +25635,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 "Bizikleten aparkalekua editatu"
 
+#. 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 "Bizikleta-denda"
@@ -25582,40 +25693,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 "Bizikleta-denda editatu"
 
 #. 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 ""
@@ -25624,10 +25735,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 "Bizikleten alokairua editatu"
 
 #. 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"
@@ -25635,5 +25746,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -25643,5 +25754,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"
@@ -25649,5 +25760,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr "UIC-Erreferentzia"
@@ -25655,5 +25766,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr "Trenaren geralekua"
@@ -25661,5 +25772,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 "Geralekua editatu"
@@ -25667,5 +25778,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "Tranbiaren-geralekua"
@@ -25674,5 +25785,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 "Tranbia-geralekua editatu"
@@ -25680,5 +25791,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "Trenbideko nasa"
@@ -25687,5 +25798,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 "Trenbideko nasa editatu"
@@ -25697,5 +25808,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 "Erreferentzia (pista zenbakia)"
@@ -25704,11 +25815,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 "Azalera"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Subway Entrance"
 msgstr "Metro-sarrera"
@@ -25717,5 +25828,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 "Metroaren sarrera editatu"
@@ -25723,5 +25834,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 "Gurpildun aulkia"
@@ -25730,5 +25841,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "Autobus-estazioa"
@@ -25737,5 +25848,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 "Autobus-estazioa editatu"
@@ -25743,5 +25854,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "Autobus-gelakua"
@@ -25751,5 +25862,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 "Autobus-geralekua editatu"
@@ -25758,6 +25869,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
@@ -25769,10 +25880,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 "Jarlekua"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
 msgstr "Ukimen-zola"
@@ -25780,10 +25891,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Bus Platform"
 msgstr "Autobusaren plataforma"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1841
 msgid "Edit Bus Platform"
 msgstr "Autobusaren plataforma editatu"
@@ -25791,10 +25902,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 ""
@@ -25803,6 +25914,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 "Txanponak"
@@ -25811,6 +25922,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 "Oharrak"
@@ -25819,6 +25930,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 "Errekarga-txartelak eta diru-zorro elektronikoak"
@@ -25827,6 +25938,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 "Debitu-txartelak"
@@ -25835,6 +25946,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 "Kreditu-txartelak"
@@ -25842,10 +25953,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 "Fideltasun edo deskontu txartelak"
 
 #. item "Taxi"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Taxi"
 msgstr "Taxia"
@@ -25853,5 +25964,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 "Taxi-geltokia editatu"
@@ -25859,10 +25970,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "Aireportua"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
 msgstr "Aireportu-eremua"
@@ -25870,5 +25981,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 "Aireportu-eremua editatu"
@@ -25876,10 +25987,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1878
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1879
 msgid "ICAO"
 msgstr "ICAO"
@@ -25888,5 +25999,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr "Pista"
@@ -25894,5 +26005,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 "Pista editatu"
@@ -25900,5 +26011,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr "Errodaje-pista"
@@ -25906,5 +26017,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 "Errodaje-pista editatu"
@@ -25912,5 +26023,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr "Heliportua"
@@ -25918,5 +26029,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 "Heliportua editatu"
@@ -25926,5 +26037,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 "Gelditzeko-plataforma"
@@ -25934,5 +26045,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 "Hangar"
@@ -25943,6 +26054,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 "Baliza"
@@ -25952,5 +26063,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 "Haize-mahuka"
@@ -25959,5 +26070,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr "Terminala"
@@ -25965,10 +26076,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 "Terminala editatu"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1935
 msgctxt "airport"
 msgid "Gate"
@@ -25977,15 +26088,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 "Terminaleko atea editatu"
 
 #. 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 ""
@@ -25997,5 +26108,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 "Hotel"
@@ -26004,5 +26115,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 "Hotela editatu"
@@ -26016,8 +26127,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 "Izarrak"
@@ -26053,12 +26164,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 ""
@@ -26079,12 +26190,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 ""
@@ -26105,12 +26216,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 ""
@@ -26137,12 +26248,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 "terminala"
@@ -26163,12 +26274,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 ""
@@ -26191,12 +26302,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 ""
@@ -26218,12 +26329,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 ""
@@ -26245,12 +26356,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 ""
@@ -26272,17 +26383,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 "Motela"
@@ -26290,20 +26401,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 "Motela editatu"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Pentsioa"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Pentsioa editatu"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "Bungalowa"
@@ -26311,10 +26422,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 "Bungalowa editatu"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
 msgstr "Aterpetxea"
@@ -26322,15 +26433,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 "Aterpetxea editatu"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2033
 msgid "Alpine Hut"
 msgstr "Mediko aterpea"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2034
 msgid "Edit Alpine Hut"
 msgstr "Mendiko aterpea editatu"
@@ -26338,10 +26449,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
 msgstr "Karabanentzako kanpalekua"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
 msgstr "Karabanentzako kanpalekua editatu"
@@ -26349,30 +26460,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 "Kanpalekua"
@@ -26380,10 +26491,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 "Kanpalekua editatu"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Janaria+Edariak"
@@ -26394,5 +26505,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 "Jatetxea"
@@ -26400,5 +26511,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 "Jatetxea editatu"
@@ -26407,6 +26518,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 "Sukaldaritza"
@@ -26414,5 +26525,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 "italiarra"
@@ -26420,5 +26531,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 "txinatarra"
@@ -26426,5 +26537,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 "pizzeria"
@@ -26432,5 +26543,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 "hanburgesategia"
@@ -26438,5 +26549,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 "greziarra"
@@ -26444,5 +26555,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 "alemaniarra"
@@ -26450,5 +26561,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 "indiarra"
@@ -26456,5 +26567,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 "bertakoa"
@@ -26462,5 +26573,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 "kebab"
@@ -26468,5 +26579,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 "turkiarra"
@@ -26474,5 +26585,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 "asiarra"
@@ -26480,5 +26591,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 "thailandiarra"
@@ -26486,5 +26597,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 "mexikarra"
@@ -26492,5 +26603,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 "japoniarra"
@@ -26498,5 +26609,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 "frantsesa"
@@ -26504,5 +26615,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 "sandwich-a"
@@ -26510,5 +26621,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 "sushi-a"
@@ -26516,10 +26627,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 "Otordu lasterreko jatetxea"
@@ -26527,20 +26638,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 "Otordu lasterreko jatetxea editatu"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "fish_and_chips"
 msgstr "fish and chips (arraina eta pataten jatetxea)"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "chicken"
 msgstr "oilaskoa"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2131
 msgid "Food Court"
 msgstr ""
@@ -26548,10 +26659,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 "Kafetegia"
@@ -26559,15 +26670,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 "Kafetegia editatu"
 
 #. 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 "Pub"
@@ -26575,20 +26686,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 "Pub-a editatu"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2186
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Edit Biergarten"
 msgstr "Biergarten-a editatu"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr "Taberna"
@@ -26596,10 +26707,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 "Taberna editatu"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2219
 msgid "Nightclub"
 msgstr "Diskoteka"
@@ -26607,25 +26718,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 "Diskoteka editatu"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Turismoa"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr "Erakarpena"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr "Erakarpena editatu"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "Ikuspegi-gunea"
@@ -26633,10 +26744,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 "Ikuspegi-gunea editatu"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "Zelata-dorrea"
@@ -26644,20 +26755,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "Informazio bulegoa"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr "Xehetasun-maila"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "topografiko"
@@ -26690,32 +26801,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 "kalea"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr "eskema"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr "Erakutsitako ingurua"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr "gunea"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "hiria"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "erregioa"
@@ -26724,6 +26835,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 "Deskribapen zehatzagoa"
@@ -26733,5 +26844,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 "Erakutsitako bideak:"
@@ -26739,5 +26850,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 "Mendi-ibiliak"
@@ -26746,6 +26857,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 "Txirrindularitza"
@@ -26753,5 +26864,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 "Mendi-bizikleta"
@@ -26760,6 +26871,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 "Eskia"
@@ -26767,5 +26878,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 "Zaldiketa"
@@ -26773,50 +26884,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 "... beste garraio mota batzuk aukeran"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "Informazio-panela"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
 msgstr "Iragarki-taula"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "notice"
 msgstr "oharra"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "history"
 msgstr "historia"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "natura"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
 msgstr "basa-bizitza"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr "landareak"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2282
 msgid "Guidepost"
 msgstr "Informazio-zutoina"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2297
 msgid "Information Terminal"
 msgstr "Informazio-gunea"
@@ -26824,10 +26935,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 "Deskribapen zehatza"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr "Audiogida"
@@ -26835,25 +26946,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 "Telefono mugikor bidezko audiogida?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr "Telefono zenbakia"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr "Beste informazio gune batzuk"
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "Aisia"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Zinema"
@@ -26862,10 +26973,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 "Zinema editatu"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Zoo"
@@ -26874,10 +26985,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 "Zooa editatu"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -26886,45 +26997,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 "hesia"
 
 #. 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 "Jolas-parkea"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr "Jolas-parkea editatu"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "Ur-jolasen parkea"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Ur-jolasen parkea editatu"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr ""
@@ -26934,5 +27045,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 ""
@@ -26960,20 +27071,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 "Asteartetik Igandera 08:00-15:00; Larunbatetan 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Access"
 msgstr "Sarbidea"
@@ -26981,5 +27092,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Jolastokia"
@@ -26987,15 +27098,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 "Jolastokia editatu"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "Piknik-gunea"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "Piknik-gunea editatu"
@@ -27003,10 +27114,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 "Barbakoa"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
 msgstr ""
@@ -27014,15 +27125,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"
@@ -27030,30 +27136,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 "Arrantza"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "Arrantza editatu"
 
 #. 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 "Museoa"
@@ -27061,10 +27162,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 "Museoa editatu"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Antzokia"
@@ -27073,10 +27174,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 "Antzokia editatu"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Liburutegia"
@@ -27085,10 +27186,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 "Liburutegia editatu"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Arte zentrua"
@@ -27096,10 +27197,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 "Arte zentrua editatu"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Artelana"
@@ -27107,10 +27208,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 "Artelana editatu"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "Gurtze-lekua"
@@ -27120,5 +27221,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 "Gurtze-lekua editatu"
@@ -27127,6 +27228,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 "Erlijioa"
@@ -27135,6 +27236,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 "bahaista"
@@ -27143,6 +27244,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 "budista"
@@ -27151,6 +27252,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 "kristaua"
@@ -27159,6 +27260,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 "hindua"
@@ -27167,6 +27268,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 "jainista"
@@ -27175,6 +27276,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 "judu"
@@ -27183,6 +27284,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 "musulman"
@@ -27191,6 +27292,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 "sij"
@@ -27199,6 +27300,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 "espiritualista"
@@ -27207,6 +27308,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 "taoista"
@@ -27215,6 +27316,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 "unitarismo"
@@ -27223,6 +27324,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 "zoroastrika"
@@ -27231,6 +27332,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 "Sinesmena"
@@ -27239,6 +27340,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 "anglikano"
@@ -27247,6 +27348,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 "baptista"
@@ -27255,6 +27356,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 "katoliko"
@@ -27263,6 +27364,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 "ebanjeliko"
@@ -27271,6 +27372,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 "Jehovaren lekukoak"
@@ -27279,6 +27380,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 "luterano"
@@ -27287,6 +27388,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 "metodista"
@@ -27295,6 +27396,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 "mormoi"
@@ -27303,6 +27404,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 "ortodoxo"
@@ -27311,6 +27412,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 "pentekostal"
@@ -27319,6 +27420,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 "presbiteriano"
@@ -27327,6 +27428,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 "protestante"
@@ -27335,6 +27436,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 "kuakero"
@@ -27343,6 +27444,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 "xii"
@@ -27351,36 +27452,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 "suni"
 
 #. 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 ""
@@ -27388,15 +27489,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 ""
@@ -27404,5 +27505,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 "Eraikin-publikoa"
@@ -27410,10 +27511,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 "Eraikin-publikoa editatu"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Udaletxea"
@@ -27421,5 +27522,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 "Udaletxea editatu"
@@ -27428,10 +27529,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 "Enbaxada"
@@ -27439,10 +27540,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 "Enbaxada editatu"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Epaitegia"
@@ -27451,10 +27552,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 "Epaitegia editatu"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Gartzela"
@@ -27463,10 +27564,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 "Gartzela editatu"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "Polizia"
@@ -27476,10 +27577,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 "Polizia editatu"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Suhiltzaile-etxea"
@@ -27488,10 +27589,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 "Suhiltzaile-etxea editatu"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Postetxea"
@@ -27499,25 +27600,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 "Postetxea-editatu"
 
 #. 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 "Haurreskola"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "Haurreskola editatu"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "Eskola"
@@ -27525,10 +27626,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 "Eskola editatu"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Unibertsitatea"
@@ -27536,10 +27637,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 "Unibertsitatea editatu"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "Batxilergo-eskola"
@@ -27547,10 +27648,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 "Batxilergo-eskola editatu"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr ""
@@ -27558,20 +27659,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 "Osasuna"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Ospitalea"
@@ -27579,10 +27680,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 "Ospitalea editatu"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "Medikuak"
@@ -27590,25 +27691,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 "Medikuak editatu"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "Dentista editatu"
 
 #. 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 ""
@@ -27616,5 +27717,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Botika"
@@ -27622,5 +27723,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 "Botika editatu"
@@ -27628,10 +27729,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2596
 msgid "Dispensing"
 msgstr "Medikuaren errezetarekin saltzen dute"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2600
 msgid "Hearing Aids"
 msgstr ""
@@ -27639,5 +27740,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 ""
@@ -27645,5 +27746,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr ""
@@ -27651,5 +27752,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 ""
@@ -27657,5 +27758,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua"
@@ -27664,5 +27765,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 "Larrieldietarako sarrera puntua editatu"
@@ -27671,15 +27772,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 "Puntu-zenbakia"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2625
 msgid "Point Name"
 msgstr "Puntuaren izena"
 
 #. 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 "(Erabili nazioarteko kodea, hala nola +12-345-67890)"
@@ -27688,5 +27789,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Albaitaria"
@@ -27695,10 +27796,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 "Albaitaria editatu"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr "mugatua"
@@ -27706,15 +27807,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 "Oharra"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "Gutunontzia"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Telefonoa"
@@ -27723,15 +27824,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 "Telefonoa editatu"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "Telefono-txartelak"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr ""
@@ -27740,5 +27841,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 ""
@@ -27748,5 +27849,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 ""
@@ -27754,5 +27855,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"
@@ -27761,5 +27862,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"
@@ -27767,5 +27868,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -27773,5 +27874,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -27779,60 +27880,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"
-msgstr "postea"
+#: 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 ""
@@ -27840,5 +27936,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "Birziklapena"
@@ -27847,5 +27943,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 "Birziklatze-gunea editatu"
@@ -27853,40 +27949,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Bateria"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Ontziak"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Beira"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Papera"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Txatarra"
 
 #. 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 "Paperontzia"
@@ -27894,5 +27990,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 "Paperontzia editatu"
@@ -27901,30 +27997,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2707
 msgid "Backrest"
 msgstr "Aulkiaren bizkarraldea"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "Material"
 msgstr "Materiala"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "stone"
 msgstr "harria"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "plastic"
 msgstr "plastikoa"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgid "Colour"
 msgstr "Kolorea"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "black"
@@ -27932,5 +28028,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -27938,5 +28034,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -27944,5 +28040,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -27950,5 +28046,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -27956,5 +28052,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -27962,5 +28058,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -27968,20 +28064,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2710
 msgid "Amount of Seats"
 msgstr "Jarleku kopurua"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "Edit Shelter"
 msgstr "Aterpea editatu"
 
 #. 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"
@@ -27989,5 +28085,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"
@@ -27995,5 +28091,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"
@@ -28001,5 +28097,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"
@@ -28007,10 +28103,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr "Ehiza-postua"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr "Ehiza-postua editatu"
@@ -28019,10 +28115,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 "Garaiera"
 
 #. 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"
@@ -28030,20 +28126,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr "erdia"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr "beteta"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "Ezkutatu"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr "Esklusa"
@@ -28051,5 +28147,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Iturria (edateko ona)"
@@ -28058,10 +28154,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 "Iturria (edateko ona) editatu"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr "Suteentzako hidrantea"
@@ -28070,5 +28166,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 "Suteentzako hidrantea editatu"
@@ -28076,5 +28172,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"
@@ -28082,5 +28178,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -28088,5 +28184,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -28094,16 +28190,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"
@@ -28111,5 +28207,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"
@@ -28117,5 +28213,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -28123,26 +28219,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 ""
@@ -28150,20 +28241,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 "Kirolak"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "Kirol-instalazioak"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "Estadioa"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "Estadioa editatu"
@@ -28177,6 +28268,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 "aukeratu kirola:"
@@ -28522,34 +28613,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 "kirola"
@@ -28559,6 +28650,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 "multi"
@@ -28568,6 +28659,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 "arku-tiroa"
@@ -28577,6 +28668,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 "atletismoa"
@@ -28586,6 +28677,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 ""
@@ -28595,6 +28686,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 "futbol australiarra"
@@ -28604,6 +28695,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 "beisbola"
@@ -28613,6 +28704,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 "saskibaloia"
@@ -28622,6 +28713,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 "boules"
@@ -28631,6 +28722,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 "bola-jokoa"
@@ -28640,6 +28731,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 ""
@@ -28649,6 +28740,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 "piragua"
@@ -28658,6 +28749,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 "alpinismoa"
@@ -28667,6 +28758,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 "cricketa"
@@ -28676,6 +28767,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 "Saredun-cricketa"
@@ -28685,6 +28776,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 "croqueta"
@@ -28694,6 +28785,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 "txirrindularitza"
@@ -28703,6 +28794,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 "txakur-lasterketa"
@@ -28712,6 +28803,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 "hipika"
@@ -28721,6 +28812,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 ""
@@ -28730,6 +28821,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 "golfa"
@@ -28739,6 +28830,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 "gimnasia"
@@ -28748,6 +28839,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 "hockeya"
@@ -28757,6 +28848,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 "zaldi-lasterketa"
@@ -28766,6 +28857,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 "motorra"
@@ -28775,6 +28866,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 "euskal pilota"
@@ -28784,6 +28875,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 "erraketa"
@@ -28793,6 +28884,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 ""
@@ -28802,6 +28893,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 ""
@@ -28811,6 +28902,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 "tiro"
@@ -28820,6 +28911,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 "skate-a"
@@ -28829,6 +28920,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 "patinajea"
@@ -28838,6 +28929,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 "eskia"
@@ -28847,6 +28938,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 "futbola"
@@ -28856,6 +28947,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 "igeriketa"
@@ -28865,6 +28956,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 "ping-pong-a"
@@ -28874,71 +28965,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 "tenisa"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2764
 msgid "Sports Centre"
 msgstr "Kiroldegia"
 
 #. 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 "Kiroldegia editatu"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "Kirol-zelaia"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "Kirol-zelaia editatu"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "Lasterketa-pista"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "Lasterketa-pista editatu"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Golf-zelaia"
 
 #. 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 "Golf-zelaia editatu"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2797
 msgid "Miniature Golf"
 msgstr "Minigolfa"
 
 #. 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 "Minigolfa editatu"
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "Kirola"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2805
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
 msgstr "Multi"
@@ -28986,25 +29077,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 "mota"
@@ -29054,26 +29145,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 "zelaia"
@@ -29123,26 +29214,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 "kiroldegia"
@@ -29187,149 +29278,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 "estadioa"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2811
 msgid "10pin"
 msgstr "Bola-jokoa"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
 msgstr "Bola-jokoa editatu"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr "Atletismoa"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "Atletismoa editatu"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Arku-tiroa"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "Arku-tiroa editatu"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "Alpinismoa"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "Alpinismoa editatu"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "Piraguismoa"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "Piraguismoa editatu"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr "Txirrindularitza editatu"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr "Txakur-lasterketak"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "Txakur-lasterketak editatu"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "Hipika"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr "Hipika editatu"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr "Zaldi-lasterketak"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "Zaldi-lasterketak editatu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "Gimnasia editatu"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "Patinajea"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Patinajea editatu"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr "Skate-a"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr "Skate-parkea editatu"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Igeriketa"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "Igeriketa editatu"
@@ -29337,60 +29428,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 "Eskia editatu"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr "Eski-pista mota"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "jaitsiera"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "nordikoa"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
 msgstr "snowboard parkea"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "Zailtasuna"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "hasiberria"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "erraza"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
 msgstr "aurreratua"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "expert"
 msgstr "aditua"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "freeride"
 msgstr "pistatik kanpo"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "Tiro"
@@ -29398,105 +29489,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 "Tiro-a editatu"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "Kirolak (pilota-kirolak)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Futbola"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "Futbola editatu"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr "Futbol australiarra"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "Futbol australiarra editatu"
 
 #. 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 "Beisbola"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "Beisbola editatu"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "Saskibaloia"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "Saskibaloia editatu"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr ""
@@ -29504,10 +29595,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 ""
@@ -29515,120 +29606,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 "Golfa"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2980
 msgid "Edit Golf"
 msgstr "Golfa editatu"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr "golf-zelaia"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr "Boulea"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr "Boulea editatu"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr "Bola-jokoa"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr "Bola-jokoa editatu"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "Cricket-a"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "Cricket-a editatu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr "Saredun-cricket-a"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr "Saredun-cricket-a editatu"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "Croquet-a"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr "Croquet-a editatu"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "Hockey-a"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Hockey-a editatu"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3021
 msgid "Pelota"
 msgstr "Frontoia (Euskal pilota)"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3022
 msgid "Edit Pelota"
 msgstr "Frontoia (Euskal pilota) editatu"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3027
 msgid "Racquet"
 msgstr "Erraketa"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3028
 msgid "Edit Racquet"
 msgstr "Erraketa editatu"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "Ping-pong-a editatu"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3039
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3040
 msgid "Edit Tennis"
 msgstr "Tenisa editatu"
@@ -29636,40 +29727,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 ""
@@ -29677,20 +29768,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 ""
@@ -29698,10 +29789,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 "Gizakiak eraikia"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "Eraikina"
@@ -29709,25 +29800,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 "Dorrea"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Dorrea editatu"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "Tower type"
 msgstr "Dorre mota"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "communication"
 msgstr "komunikazioa"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "observation"
 msgstr "behaketa"
@@ -29736,5 +29827,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 "Altuera (metrotan)"
@@ -29742,5 +29833,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr ""
@@ -29750,15 +29841,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "Lantokia"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "Lantokia editatu"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr ""
@@ -29766,10 +29857,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 "Haize-errota"
@@ -29777,20 +29868,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 "Haize-errota editatu"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "Hodiak"
@@ -29799,5 +29890,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 "Hodiak editatu"
@@ -29841,8 +29932,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
@@ -29852,10 +29943,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 "gasa"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr "termikoa"
@@ -29863,20 +29954,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 "olioa"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "sewage"
 msgstr "hondakin-ura"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgid "Location"
 msgstr "Kokapena"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underwater"
@@ -29884,5 +29975,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"
@@ -29890,5 +29981,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Garabia"
@@ -29896,10 +29987,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 "Garabia editatu"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr ""
@@ -29908,25 +29999,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 ""
@@ -29934,5 +30025,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 ""
@@ -29940,5 +30031,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 ""
@@ -29946,5 +30037,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 ""
@@ -29953,6 +30044,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 "ikatza"
@@ -29960,5 +30051,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 ""
@@ -29966,5 +30057,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 ""
@@ -29972,5 +30063,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 ""
@@ -29978,5 +30069,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 ""
@@ -29984,5 +30075,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 ""
@@ -29990,5 +30081,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 ""
@@ -29996,5 +30087,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 ""
@@ -30002,5 +30093,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 ""
@@ -30008,5 +30099,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 ""
@@ -30014,5 +30105,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 ""
@@ -30020,5 +30111,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 ""
@@ -30026,5 +30117,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 ""
@@ -30032,5 +30123,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 ""
@@ -30038,10 +30129,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 ""
@@ -30049,10 +30140,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 ""
@@ -30060,10 +30151,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 ""
@@ -30071,15 +30162,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Ur-dorrea"
 
 #. 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 "Ur-dorrea editatu"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr ""
@@ -30087,10 +30178,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 "Hondakin-uren araztegia editatu"
@@ -30100,10 +30191,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 "Hondakin-uren araztegia editatu"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr ""
@@ -30111,10 +30202,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 "Iturria"
@@ -30123,10 +30214,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 "Iturria editatu"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr ""
@@ -30134,5 +30225,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 ""
@@ -30140,5 +30231,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Itsasargia"
@@ -30146,5 +30237,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 "Itsasargia editatu"
@@ -30152,10 +30243,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 "Baliza editatu"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3224
 msgid "Street Lamp"
 msgstr ""
@@ -30163,5 +30254,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 ""
@@ -30170,15 +30261,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 ""
@@ -30186,55 +30277,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"
@@ -30242,5 +30333,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "Erpin geodesikoa"
@@ -30248,10 +30339,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 "Erpin geodesikoa"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3248
 msgid "Surveillance"
 msgstr "Zaintza-kamera"
@@ -30259,30 +30350,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 "Zaintza-kamera editatu"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "indoor"
 msgstr "barruko"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "outdoor"
 msgstr "kanpoko"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "public"
 msgstr "publikoa"
 
 #. 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 "Energia-sorgailua"
@@ -30292,140 +30383,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 "Energia sorgailua editatu"
 
 #. 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 "hidrauliko"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "nuklear"
 
 #. 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 "haizea"
 
 #. 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 "fotovoltaiko"
 
 #. 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 ""
@@ -30433,10 +30524,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 ""
@@ -30451,9 +30542,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 ""
@@ -30468,9 +30559,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 ""
@@ -30485,9 +30576,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 ""
@@ -30502,54 +30593,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 "Zentral elektrikoa"
@@ -30558,10 +30649,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 "Zentral elektrikoa editatu"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "Azpiestazio elektrikoa"
@@ -30570,5 +30661,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 "Azpiestazio elektrikoa editatu"
@@ -30576,10 +30667,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 "Linearen erreferentzia"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -30588,5 +30679,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 ""
@@ -30594,5 +30685,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Elektrizitate-dorrea"
@@ -30603,5 +30694,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 "Elektrizitate-dorrea editatu"
@@ -30609,10 +30700,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 "Dorrearen erreferentzia"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3312
+#: build/trans_presets.java:3313
 msgid "Pole"
 msgstr ""
@@ -30621,5 +30712,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 ""
@@ -30627,10 +30718,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 "Linea elektrikoa"
@@ -30639,15 +30730,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 "Linea elektrikoa editatu"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgid "Line type"
 msgstr "Linea mota"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "line"
@@ -30655,5 +30746,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"
@@ -30661,40 +30752,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3329
 msgid "Amount of Cables"
 msgstr "Kable kopurua"
 
 #. 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 "Alanbre kopurua (eroale hobea) kable elektriko bakoitzeko"
 
 #. 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 "bakuna"
 
 #. 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 "bikoitza"
 
 #. 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 "hirukoitza"
 
 #. 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 "Gune historikoak"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Gaztelua"
@@ -30703,20 +30794,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 "Gaztelua editatu"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Hondakinak"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Hondakinak editatu"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "Gune-arkeologikoa"
@@ -30725,10 +30816,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 "Gune-arkeologikoa editatu"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "Gudu-zelaia"
@@ -30736,10 +30827,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 "Gudu-zelaia editatu"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
 msgstr "Gune-paleontologikoa"
@@ -30747,5 +30838,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 "Gune-paleontologikoa editatu"
@@ -30753,15 +30844,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "Monumentua"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3370
 msgid "Edit Monument"
 msgstr "Monumentua editatu"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "Oroitarria"
@@ -30769,60 +30860,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 "Oroitarria editatu"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr "Gurutzadura"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr "Gurutzadura editatu"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr "Santutxoa"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr "Santutxoa editatu"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr "Mugarria"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr "Mugarria editatu"
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "Dendak"
 
 #. 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 "Supermerkatua"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "Supermerkatua editatu"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
 msgstr "Janari-denda"
@@ -30830,10 +30921,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 "Janari-denda editatu"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Kioskoa"
@@ -30841,5 +30932,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 "Kioskoa editatu"
@@ -30847,5 +30938,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Okindegia"
@@ -30853,10 +30944,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 "Okindegia editatu"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Harategia"
@@ -30864,10 +30955,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 "Harategia editatu"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr ""
@@ -30875,10 +30966,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 ""
@@ -30886,10 +30977,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 ""
@@ -30897,5 +30988,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 ""
@@ -30903,5 +30994,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr ""
@@ -30909,10 +31000,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 ""
@@ -30920,15 +31011,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 "Produktu organikoen denda"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "Produktu organikoen denda"
@@ -30936,5 +31027,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr "Alkohola"
@@ -30942,25 +31033,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 "Alkoholdun edarien denda editatu"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3491
+#: build/trans_presets.java:3492
 msgid "Beverages"
 msgstr "Edariak"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3493
 msgid "Edit Beverages Shop"
 msgstr "Edari-denda editatu"
 
 #. 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 ""
@@ -30968,20 +31059,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 "Zapatak"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "Zapata-denda editatu"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "Kanpoko aktibitateen denda"
@@ -30989,10 +31080,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 "Kanpoko aktibitateen denda editatu"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
 msgstr "Kiroldenda editatu"
@@ -31000,5 +31091,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Tindategia"
@@ -31006,10 +31097,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 "Tindategia editatu"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Garbitegia"
@@ -31017,20 +31108,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 "Garbitegia editatu"
 
 #. 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 ""
@@ -31038,35 +31129,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 "Ordenagailua"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "Ordenagailu-denda editatu"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "Elektronika-denda editatu"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr ""
@@ -31074,10 +31165,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 ""
@@ -31085,35 +31176,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 "HI-FI"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr "HI-FI denda editatu"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3602
 msgid "Video"
 msgstr "Bideoa"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:3603
 msgid "Edit Video Shop"
 msgstr "Bideo-denda editatu"
 
 #. group "Cash"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3609
 msgid "Cash"
 msgstr "Dirua"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Banku"
@@ -31121,5 +31212,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 "Bankua editatu"
@@ -31127,10 +31218,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 "Kutxazain automatikoa"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Diru-trukea"
@@ -31138,5 +31229,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 "Diru-trukea editatu"
@@ -31144,10 +31235,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 "Kutxazain automatikoa editatu"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr ""
@@ -31155,10 +31246,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 ""
@@ -31166,5 +31257,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 ""
@@ -31172,35 +31263,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr "Botika"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
 msgstr "Botika editatu"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "Ileapaindegia"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Ileapaindegia editatu"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
 msgstr "Optika"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
 msgstr "Optika editatu"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr ""
@@ -31208,10 +31299,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 ""
@@ -31219,5 +31310,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 ""
@@ -31225,5 +31316,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "Loradenda"
@@ -31231,10 +31322,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 "Loradenda editatu"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr "Lorezaintza zentrua"
@@ -31242,5 +31333,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 "Lorezaintza zentrua editatu"
@@ -31248,5 +31339,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "Brikolaje-denda"
@@ -31254,10 +31345,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 "Brikolaje denda editatu"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr "Burdindegia"
@@ -31265,10 +31356,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 "Burdindegia editatu"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3719
 msgid "Paint"
 msgstr ""
@@ -31276,5 +31367,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 ""
@@ -31282,15 +31373,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
 msgstr "Altzariak"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
 msgstr "Altzari-denda editatu"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
 msgstr ""
@@ -31298,10 +31389,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 ""
@@ -31309,10 +31400,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 ""
@@ -31320,5 +31411,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 ""
@@ -31326,15 +31417,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
 msgstr "Paper-denda"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
 msgstr "Paper-denda editatu"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
 msgstr ""
@@ -31342,15 +31433,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 "Liburudenda"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3779
 msgid "Edit Book Store"
 msgstr "Liburudenda editatu"
@@ -31358,15 +31449,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Bidaia-agentzia"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "Bidaia-agentzia editatu"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr ""
@@ -31374,20 +31465,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 "Jostailuak"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "Jostailu-denda editatu"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
 msgstr ""
@@ -31395,10 +31486,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 "Makina-saltzailea"
@@ -31406,5 +31497,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 "Makina-saltzailea editatu"
@@ -31412,180 +31503,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 "Produktuen makina-saltzailea"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "garraio publikoko txartelak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "garraio publikoaren mapak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr "aparkalekuko txartelak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "Elikadura"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "edariak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "gozokiak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "zigarretak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr "argazkiak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "animalientzako janaria"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "egunkariak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "jostailuak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "seiluak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "SIM txartelak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "Telefono-txartelak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "Bonuak"
 
 #. 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 "kondoiak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "tanpoiak"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "excrement_bags"
 msgstr "gorotz-poltsa"
 
 #. 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 "Geografia"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "Mugak"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "Nazionala"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "Muga nazionala editatu"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "Administratiboa"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "Muga administratiboa editatu"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "Zibila"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "Muga zibila editatu"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr "Politikoa"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr "Muga politikoa editatu"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "Parke nazionala"
 
 #. 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 "Parke nazionala editatu"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Lekuak"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "Kontinentea"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "Kontinentea editatu"
 
 #. 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"
@@ -31593,10 +31684,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Herrialdea editatu"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31604,25 +31695,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "Estatua editatu"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Erregioa"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Erregioa editatu"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr "Eskualdea"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr "Eskualdea editatu"
@@ -31630,5 +31721,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
@@ -31637,10 +31728,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "Hiria (100.000 biztanle baino gehiago) editatu"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "Herria (10.000 - 100.000 biztanle)"
@@ -31648,10 +31739,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 "Herria (10.000 - 100.000 biztanle) editatu"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Auzoa"
@@ -31659,35 +31750,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 "Auzoa editatu"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "Herria (10.000 biztale baino gutxiago)"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "Herria (10.000 biztale baino gutxiago) editatu"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak)"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak) editatu"
 
 #. 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 ""
@@ -31695,5 +31786,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr "Ingurua (leku geografikoa)"
@@ -31701,10 +31792,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 "Ingurua (leku geografikoa) editatu"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3956
+#: build/trans_presets.java:3957
 msgid "Peak"
 msgstr "Mendi-tontorra"
@@ -31712,10 +31803,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 "Mendi-tontorra editatu"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Glaziarra"
@@ -31723,10 +31814,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 "Glaziarra editatu"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Sumendia"
@@ -31734,10 +31825,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 "Sumendia editatu"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Kobazuloaren sarrera"
@@ -31745,5 +31836,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 "Kobazuloaren sarrera editatu"
@@ -31751,5 +31842,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Irla"
@@ -31757,10 +31848,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 "Irla editatu"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr "Irlatxoa"
@@ -31768,15 +31859,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 "Irlatxoa editatu"
 
 #. 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 "Zuhaitza"
@@ -31785,15 +31876,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 "Zuhaitza editatu"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Izen-botanikoa"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "Basoa"
@@ -31802,10 +31893,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 "Basoa editatu"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -31813,5 +31904,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -31819,5 +31910,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -31825,5 +31916,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Basoa"
@@ -31832,30 +31923,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 "Basoa editatu"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "konifero"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "hostoerorkorra"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "misto"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "Natura-erreserba"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "Natura-erreserba editatu"
@@ -31863,15 +31954,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "Harritza"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "Harritza editatu"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr ""
@@ -31879,20 +31970,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 "Sastraka"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "Sastraka editatu"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "Txilardi"
@@ -31900,15 +31991,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 "Txilardia editatu"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Lurzorua"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "Etxaldea"
@@ -31917,40 +32008,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 "Etxalde-gunea editatu"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "Nekazaritza-lurra"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "Nekazaritza-lurrak editatu"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "Belardia"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "Mahastia"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "Mahastia editatu"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31958,15 +32049,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 "Soroak"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "Soroak editatu"
@@ -31974,25 +32065,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Lorategia"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "Lorategia editatu"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "Belarra"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr "Udal-parkea"
@@ -32000,10 +32091,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 "Udal-parkea editatu"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4123
 msgid "Common"
 msgstr "Amankomuna"
@@ -32011,20 +32102,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 "Amankomuna editatu"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4129
 msgid "Park"
 msgstr "Parkea"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "Parkea editatu"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "Aisialdi-gunea"
@@ -32032,5 +32123,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 "Aisialdi-gunea editatu"
@@ -32038,15 +32129,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Bizitegi-gunea"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Bizitegi-gunea editatu"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Hilerria (txikia)"
@@ -32054,10 +32145,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 "Hilerria (txikia) editatu"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "Hilerria"
@@ -32065,40 +32156,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 "Hilerria editatu"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Merkataritza"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Merkataritza-gunea editatu"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Bulegoak"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Bulego-eremua editatu"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Industriala"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Industrialdea editatu"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr ""
@@ -32106,10 +32197,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 "Trenbide-eremua"
@@ -32117,15 +32208,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 "Trenbide-eremua editatu"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "Militarra"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "Eremu militarra editatu"
@@ -32133,55 +32224,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Eraikitze-eremua"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Eraikitze-eremua editatu"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "Lugorria"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "Lugorria editatu"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "Eraikitzeko lurzorua"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "Eraikitzeko lurzorua editatu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "Zabortegia"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "Editatu zabortegia"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "Harrobia"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "Harrobia editatu"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr ""
@@ -32189,5 +32280,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
@@ -32198,5 +32289,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 "Helbideak editatu"
@@ -32204,5 +32295,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Eraikinaren atari zenbakia"
@@ -32210,5 +32301,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Eraikinaren izena"
@@ -32217,55 +32308,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 "Kale-izena"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "Hiriaren izena"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Posta-kodea"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Estatuaren kodea"
 
 #. 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 ""
@@ -32273,5 +32364,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
@@ -32283,5 +32374,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 "Helbideen Interpolazioa editatu"
@@ -32289,35 +32380,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "Zenbakien-eskema"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "bakoitia"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "bikoitia"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr "alfabetiko"
 
 #. 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 ""
@@ -32327,5 +32418,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 "Multipoligonoa editatu"
@@ -32337,5 +32428,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 "kanpoko segmentua"
@@ -32343,5 +32434,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 "barruko segmentua"
@@ -32349,5 +32440,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr "Muga"
@@ -32358,5 +32449,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 "Muga editatu"
@@ -32364,46 +32455,51 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "Boundary type"
 msgstr "Muga mota"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "administrative"
 msgstr "administratiboa"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "national"
 msgstr "nazionala"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "civil"
 msgstr "zibila"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "political"
 msgstr "politikoa"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4296
+#: build/trans_presets.java:4297
 msgid "Administrative level"
 msgstr "Maila administratiboa"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:4302
 msgid "Sub area"
 msgstr "Azpi-area"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4303
 msgid "Administration centre"
 msgstr "Administrazio gunea"
 
+#. 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 "Biraketa debekua"
@@ -32412,5 +32508,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 "Biraketa debekua editatu"
@@ -32418,40 +32514,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 "Debekua"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "ezkerrera biratzea debekatua"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "eskuinera biratzea debekatua"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "zuzen jarraitzea debekatua"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "U biraketa egitea debekatua"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_right_turn"
 msgstr "soilik eskuinera biratzea"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_left_turn"
 msgstr "soilik ezkerrera biratzea"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_straight_on"
 msgstr "aurrerantz soilik"
@@ -32460,15 +32556,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "norabide honetatik"
 
 #. 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 "bide honetara"
@@ -32476,5 +32572,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "Bidea"
@@ -32488,5 +32584,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 "Bidea editatu"
@@ -32496,5 +32592,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 "Bide mota"
@@ -32502,5 +32598,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
@@ -32510,5 +32606,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 "errepidea"
@@ -32516,5 +32612,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 "ferry"
@@ -32522,5 +32618,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 "ski"
@@ -32573,9 +32669,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 "oinezkoa"
@@ -32583,5 +32679,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 "xenda"
@@ -32589,5 +32685,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
@@ -32597,5 +32693,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 "desbideratzea"
@@ -32609,6 +32705,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
@@ -32618,5 +32714,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 "Sinboloaren deskribapena"
@@ -32628,6 +32724,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 "Sarea"
@@ -32635,5 +32731,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 "Estatuko bidea"
@@ -32641,5 +32737,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 "proposatutako"
@@ -32647,5 +32743,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 "txandakatu"
@@ -32653,5 +32749,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 "behin-behineko"
@@ -32659,5 +32755,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 "lotura"
@@ -32665,5 +32761,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 "Kolorea (hex)"
@@ -32675,15 +32771,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 "ibilbidearen segmentua"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4343
+#: build/trans_presets.java:4345
 msgid "forward segment"
 msgstr "hurrengo segmentua"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4344
+#: build/trans_presets.java:4346
 msgid "backward segment"
 msgstr "aurreko segmentua"
@@ -32691,5 +32787,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 "geldialdi puntua"
@@ -32697,5 +32793,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 "hurrengo geldialdi puntua"
@@ -32703,5 +32799,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 "aurreko geldialdi puntua"
@@ -32709,5 +32805,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32721,25 +32817,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 ""
@@ -32747,5 +32843,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -32753,5 +32849,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 ""
@@ -32760,5 +32856,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr ""
@@ -32766,5 +32862,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr ""
@@ -32772,10 +32868,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 ""
@@ -32970,6 +33066,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 "zaharkitua"
@@ -33001,5 +33097,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 "zaldia"
@@ -33154,10 +33250,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 "oztopoa"
@@ -33202,5 +33295,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr "autobidea"
@@ -33244,7 +33337,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 "pista"
@@ -33318,5 +33411,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 "zerbitzu-bidea"
@@ -33328,5 +33421,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr "ibi"
@@ -33344,5 +33437,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 ""
@@ -33353,5 +33446,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "biratzeko zirkulua"
@@ -33364,5 +33457,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 "Larrialdi-gunera sarrera"
@@ -33374,5 +33467,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 "ibaiertza"
@@ -33384,5 +33477,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "erreka"
@@ -33394,5 +33487,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "kaia"
@@ -33582,17 +33675,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 "gizakiak eraikia"
@@ -33604,5 +33697,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr "ur-lasterrak"
@@ -33650,9 +33743,27 @@
 #. <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 "trenbide-puntua"
+
+#. <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 ""
 
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33669,10 +33780,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 "beste trenbideak"
 
 #. color railover
-#: build/trans_style.java:966
+#: build/trans_style.java:981
 msgid "railover"
 msgstr "trenbide bat baino gehiago gurutzatzen diren lekua"
@@ -33700,7 +33811,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 "utzitako bidea"
@@ -33735,6 +33846,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 "aireko bidea"
@@ -33752,5 +33863,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 "aireko bidea (iluna)"
@@ -33768,5 +33879,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 "aireko bidea (argia)"
@@ -33826,8 +33937,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 "aire-bidea"
@@ -33841,5 +33952,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 "pista erraza"
@@ -33851,5 +33962,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 "bitarteko-pista"
@@ -33861,5 +33972,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 "pista aurreratua"
@@ -33871,5 +33982,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 "adituentzako pista"
@@ -33881,5 +33992,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 "estilo libreko pista"
@@ -33891,5 +34002,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 "hasiberrientzako pista"
@@ -34018,13 +34129,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 "energia"
@@ -34035,5 +34146,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 "kaia"
@@ -34045,5 +34156,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "hodia"
@@ -34159,13 +34270,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 "aisia"
@@ -34177,5 +34288,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "itsas-portua"
@@ -34249,10 +34360,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 "zerbitzuak"
@@ -34336,11 +34447,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 "zerbitzua_trafikoa"
@@ -34676,24 +34787,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 "zerbitzua_argiztapena"
@@ -34719,6 +34830,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 "ura (argia)"
@@ -34765,8 +34876,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 "osasuna"
@@ -35135,34 +35246,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 "denda"
@@ -35218,8 +35329,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 "hotel"
@@ -35295,9 +35406,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 "turismoa"
@@ -35365,9 +35476,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 "ondare historikoa"
@@ -35434,9 +35545,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 "berdea"
@@ -35447,5 +35558,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "harrobia"
@@ -35457,5 +35568,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "zabortegia"
@@ -35473,5 +35584,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 "dartsena"
@@ -35483,5 +35594,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "basoa"
@@ -35493,5 +35604,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr ""
@@ -35503,5 +35614,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "etxaldea"
@@ -35520,5 +35631,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 "txikizkako merkataritza"
@@ -35530,5 +35641,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "industriala"
@@ -35540,5 +35651,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr "hustutako industrialdea"
@@ -35550,5 +35661,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "lurzoru eraikigarria"
@@ -35560,5 +35671,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr "tren-ingurunea"
@@ -35603,7 +35714,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 "gune militarra"
@@ -35615,5 +35726,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "kanposantu"
@@ -35624,5 +35735,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "gailurra"
@@ -35635,5 +35746,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 "glaziar"
@@ -35645,5 +35756,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 "sumendia"
@@ -35685,8 +35796,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 "natura-gune"
@@ -35698,5 +35809,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "sasi"
@@ -35708,5 +35819,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "mendia"
@@ -35718,5 +35829,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr "basoa"
@@ -35728,5 +35839,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "lokatza"
@@ -35738,5 +35849,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "hondartza"
@@ -35796,8 +35907,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 "ibilbidea"
@@ -35876,12 +35987,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 "muga"
@@ -35997,11 +36108,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 "lekua"
@@ -36013,5 +36124,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
 msgstr "TIGER_datuak"
@@ -36047,6 +36158,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"
@@ -36287,9 +36398,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"
@@ -36297,44 +36407,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 "Open Aerial Map"
-
-#. <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 "Yahoo sateiltea"
-
-#. <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 ""
@@ -36342,11 +36439,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 ""
@@ -36354,73 +36450,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 "OpenCycleMap"
 
 #. <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"
-msgstr "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>
@@ -36428,29 +36551,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 kaleak"
 
+#. <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>
@@ -36458,13 +36596,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>
@@ -36472,13 +36610,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>
@@ -36486,13 +36624,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>
@@ -36502,273 +36640,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 "Czech CUZK:KM"
 
 #. <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 "Czech UHUL:ORTOFOTO"
 
 #. <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 Mapak"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr "7th Series (Zazpigarren Serieak) (OS7)"
 
 #. <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 "NPE Mapak (Tim)"
-
-#. <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 "7th Series (Zazpigarren Serieak) (OS7)"
-
-#. <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 "MLIT Japonia (ORTHO)"
-
-#. <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 "MLIT Japonia (ORTHO01)"
-
-#. <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 "MLIT Japonia (ORTHO02)"
-
-#. <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 "MLIT Japonia (ORTHO03)"
-
-#. <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 "Lodi - Italia"
 
 #. <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 "Sizilia - Italia"
 
 #. <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>
@@ -36776,35 +37737,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 ""
@@ -36816,9 +37793,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 ""
@@ -39214,4 +40192,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
@@ -39797,18 +40792,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 ""
@@ -40478,16 +41473,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 ""
@@ -40541,80 +41535,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
@@ -40622,35 +41650,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
@@ -40658,8 +41700,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
@@ -40669,11 +41719,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 ""
 
@@ -42060,4 +43141,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"
@@ -42233,4 +43322,24 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "Bai, ezabatu nodoak"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Ezabatu deskargatutako datu inguruneetatik kanpoko nodoak"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "Ez, bertan behera utzi"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "Edonola ere ezabatu nahi dituzu?"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "Datu inguruneetatik kanpoko nodoak ezabatu?"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42291,9 +43400,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 ""
 
@@ -42978,9 +44082,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 ""
@@ -43075,17 +44179,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 ""
@@ -43806,4 +44910,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
@@ -43825,25 +44945,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 "Ireki URL-a."
-
-#: ../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 ""
 
@@ -43903,6 +45009,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 ""
 
@@ -44020,5 +45156,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 ""
@@ -44032,5 +45168,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 ""
@@ -44045,12 +45181,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 ""
 
@@ -44392,2 +45542,78 @@
 msgid "Drive a race car on this layer"
 msgstr ""
+
+#~ msgid "Info about Element"
+#~ msgstr "Elementuaren informazioa"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr "Erakutsi OSM-ko nodo, bide eta erlazioen objektu informazioa."
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "NPE Mapak (Tim)"
+
+#~ msgid "NPE Maps"
+#~ msgstr "NPE Mapak"
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "Open Aerial Map"
+
+#~ msgid "Object history"
+#~ msgstr "Objektuaren historia"
+
+#~ msgid "MLIT Japan (ORTHO)"
+#~ msgstr "MLIT Japonia (ORTHO)"
+
+#~ msgid "MLIT Japan (ORTHO01)"
+#~ msgstr "MLIT Japonia (ORTHO01)"
+
+#~ msgid "MLIT Japan (ORTHO02)"
+#~ msgstr "MLIT Japonia (ORTHO02)"
+
+#~ msgid "MLIT Japan (ORTHO03)"
+#~ msgstr "MLIT Japonia (ORTHO03)"
+
+#~ msgid "Cannot open {0} file because no suitable file importer is available."
+#~ msgid_plural ""
+#~ "Cannot open {0} files because no suitable file importer is available."
+#~ msgstr[0] ""
+#~ "Ezin izan dugu {0} fitxategia ireki, ez dugulako inportatzeko tresna "
+#~ "egokirik."
+#~ msgstr[1] ""
+#~ "Ezin izan ditugu {0} fitxategi ireki, ez dugulako inportatzeko tresna "
+#~ "egokirik."
+
+#~ msgid "Yahoo Sat"
+#~ msgstr "Yahoo sateiltea"
+
+#~ msgid "Invalid URL?"
+#~ msgstr "URL desegokia?"
+
+#~ msgid "Yes, fetch images"
+#~ msgstr "Bai, jaitsi irudiak"
+
+#~ msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+#~ msgstr ""
+#~ "Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik"
+
+#~ msgid "(deactivated)"
+#~ msgstr "(desaktibatua)"
+
+#~ msgid "Warning: The complete URL is ''{0}''."
+#~ msgstr "Kontuz: URL osoa \"{0}\" da."
+
+#~ msgid ""
+#~ "The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+#~ "This may lead to wrong coordinates."
+#~ msgstr ""
+#~ "URLaren ''{0}'' proiekzioa eta egungo ''{1}'' proiekzioa ez datoz bat.\n"
+#~ "Koordenatu okerretara eraman gaitzake honek."
+
+#~ msgid ""
+#~ "Warning: Fetching WMS tiles is likely to fail. Please check you "
+#~ "preference settings."
+#~ msgstr ""
+#~ "Kontuz: WMSaren \"tile\"-eguneraketak huts egin dezake. Mesedez, "
+#~ "egiaztatu zure hobespenen konfigurazioa."
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 26721)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 26722)
@@ -4,27 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
-#. <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: 2011-07-20 11:21+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -35,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-09-02 19:11+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?
@@ -44,6 +26,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
@@ -68,8 +50,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
@@ -81,7 +63,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
@@ -95,8 +77,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
@@ -108,5 +91,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
@@ -116,6 +98,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
@@ -129,10 +111,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"
@@ -169,14 +152,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
@@ -187,7 +170,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
@@ -203,6 +186,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
@@ -212,5 +195,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
@@ -396,8 +379,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
@@ -411,6 +394,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
@@ -422,6 +405,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
@@ -436,6 +419,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
@@ -457,7 +440,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
@@ -474,5 +459,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 "Peruuta"
@@ -483,4 +468,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 "Valitse ainakin yksi jo lähetetty solmu, polku tai relaatio."
@@ -541,4 +527,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
@@ -587,5 +574,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
@@ -603,4 +590,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
@@ -621,5 +609,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
@@ -637,4 +625,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
@@ -666,8 +655,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
@@ -696,5 +685,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 "tietoihin"
@@ -763,5 +752,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 "Sulje avoimet muutoskokoelmat"
@@ -781,6 +770,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
@@ -861,9 +850,10 @@
 msgstr "Valitse jotain kopioitavaksi."
 
-#: ../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 ""
@@ -920,13 +910,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
@@ -938,5 +928,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
@@ -956,14 +946,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 "Korvaa"
 
 #: ../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 "Tiedosto on jo olemassa. Korvataanko?"
@@ -1153,5 +1143,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}"
@@ -1225,12 +1215,26 @@
 msgstr "Vie GPX-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Objektin historia"
-
-#: ../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 "Historia"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Näytä historiatietoja OSM-solmuista, -poluista tai -relaatioista."
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:46
@@ -1275,5 +1279,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 "OK"
@@ -1304,12 +1308,24 @@
 msgstr "Siirroskirjanmerkki on jo olemassa. Ylikirjoitetaanko?"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20
-msgid "Info about Element"
-msgstr "Tietoja kohteesta"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Näytä tietoja OSM-solmuista, -poluista tai -relaatioista."
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
@@ -1330,6 +1346,9 @@
 "Yhtä valituista poluista ei ole suljettu ja siksi sitä ei voida liittää."
 
-#: ../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."
@@ -1339,21 +1358,24 @@
 msgstr[1] "Valituissa poluissa on pisteitä ladatun alueen ulkopuolella."
 
-#: ../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 "Tämä voi johtaa pisteiden poistamiseen vahingossa."
 
-#: ../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 "Haluatko varmasti jatkaa?"
 
-#: ../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 "Ole hyvä ja keskeytä toiminto jos et ole varma"
 
-#: ../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 "Leikkauspisteitä ei löytynyt, joten mitään ei muutettu."
@@ -1361,33 +1383,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 "Palautetaan muutokset ennalleen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr "Solmujen kaksoiskappaleet poistettu"
 
-#: ../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 "Lisää piste kaikkiin leikkauskohtiin"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr "Muodosta uusia monikulmioita"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr "Poista suhteet"
 
-#: ../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 "Poista polut, jotka eivät ole osa sisempää monimonikulmiota"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr "Yhdistettiin osittain päällekkäiset alueet"
 
-#: ../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 "
@@ -1397,13 +1419,13 @@
 "syntynyt virheitä."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "Korjaa tagikonflikteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr "Jaa polut osiin"
 
-#: ../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 ""
@@ -1411,11 +1433,11 @@
 "käsittelemään."
 
-#: ../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 "Polkua, joka on ulompi monimonikulmiosuhteissa, ei voida käsitellä."
 
+#: ../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 "
@@ -1425,19 +1447,19 @@
 "käsitellä."
 
-#: ../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 "Polkua, joka on sisempi monimonikulmiosuhteissa, ei voida käsitellä."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363
 msgid "Removed Element from Relations"
 msgstr "Kohde poistettiin relaatioista"
 
 #. 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 "Poista tagit inner-poluilta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr "Yhdistä alueet -tominto"
@@ -1648,4 +1670,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
@@ -1665,8 +1688,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 "ylös"
@@ -1686,4 +1710,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
@@ -1703,8 +1728,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 "alas"
@@ -1787,11 +1813,22 @@
 #: ../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."
-msgstr[0] "{0} tiedoston avaaminen ei onnistu, tiedostomuotoa ei tunneta."
-msgstr[1] "{0} tiedoston avaaminen ei onnistu, tiedostomuotoa ei tunneta."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209
+"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: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>"
@@ -1799,9 +1836,9 @@
 "<html>Kansiota ''{0}'' ei voi avata.<br>Ole hyvä ja valitse tiedosto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1810,5 +1847,5 @@
 msgstr[1] "Avataan {0} tiedostoa..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1945,7 +1982,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
@@ -2119,5 +2156,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 "Tallenna"
@@ -2133,30 +2170,30 @@
 msgstr "Tiedosto {0} on jo olemassa. Ylikirjoitetaanko?"
 
-#: ../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 "Vientiosa puuttuu! Ei tallennettu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Tyhjä dokumentti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "Tallenna silti"
 
-#: ../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 "Dokumentti ei sisällä tietoa"
 
 #. 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 "Ristiriidat"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "Hylkää ristiriidat ja tallenna"
 
-#: ../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 "
@@ -2166,13 +2203,13 @@
 "ristiriidoista. Jatka tallennusta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "Tallenna OSM-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "Tallenna GPX-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "Tallenna kerros"
@@ -2225,5 +2262,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
@@ -2233,55 +2270,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 "Sulje"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Yksinkertaista polku"
 
-#: ../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 "Poistaa turhat pisteet polusta."
 
-#: ../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 "Kyllä, poista pisteet"
-
-#: ../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 "Poista pisteet ladatun alueen ulkopuolelta"
-
-#: ../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 "Ei, peruuta"
-
-#: ../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 "Peruuta toiminto"
-
-#: ../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 "Haluatko poistaa ne silti?"
-
-#: ../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 "Poista pisteitä ladatun alueen ulkopuolelta?"
-
-#: ../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 "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
 
-#: ../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
@@ -2292,10 +2296,16 @@
 msgstr "Kyllä"
 
-#: ../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 "Yksinkertaista kaikki valitut polut"
 
-#: ../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 "Peruuta toiminto"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2304,10 +2314,10 @@
 msgstr "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
 
-#: ../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 "Yksinkertaista polut?"
 
-#: ../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
@@ -2317,5 +2327,5 @@
 msgstr[1] "Yksinkertaista {0} polkua"
 
-#: ../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)"
@@ -2380,5 +2390,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 "
@@ -2389,5 +2399,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 "
@@ -2425,38 +2435,38 @@
 msgstr "Monistaa pisteet, jotka ovat monen polun käytössä."
 
-#: ../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 "Tämä piste ei ole yhdistettynä mihinkään muuhun."
 
-#: ../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 "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa."
 
-#: ../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 "Mikään valitun polun pisteistä ei ole osana muita polkuja."
 
-#: ../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 "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "Valitse joko:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* Yksi piste jolla on tageja, tai"
 
-#: ../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 "* Yksi solmu, joka on useamman polun käytössä, tai"
 
-#: ../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 ""
 "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai"
 
-#: ../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"
@@ -2465,5 +2475,5 @@
 "polkujen käytössä, tai"
 
-#: ../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."
@@ -2472,5 +2482,5 @@
 "käytössä."
 
-#: ../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"
@@ -2483,14 +2493,14 @@
 "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr "Irroitettu piste"
 
-#: ../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 "Monista {0} pisteeksi"
 
-#: ../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"
@@ -2498,4 +2508,21 @@
 msgstr[0] "Monista {0} piste {1} pisteeksi"
 msgstr[1] "Monista {0} pistettä {1} pisteeksi"
+
+#: ../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
@@ -2591,14 +2618,14 @@
 msgstr "Valinta on tyhjä"
 
-#: ../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 "Lähetä data"
 
-#: ../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 "Lähetä kaikki muutokset aktiiviselta datatasolta OSM-palvelimelle"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2609,5 +2636,5 @@
 "(tasolla \"{0}\").<br>Selvitä ensin ristiriidat.</html>"
 
-#: ../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
@@ -2615,5 +2642,5 @@
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../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 "Ei mitään lähetettävää. Hae ensin dataa."
@@ -3104,8 +3131,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
@@ -3487,5 +3514,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 "Etsi"
@@ -3723,5 +3750,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 "Muut"
@@ -3873,25 +3900,25 @@
 msgstr "Päättämätöntä konfliktia ei voida ratkaista"
 
-#: ../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 "Pitäisi olla ainakin yksi poistettava kohde, saatiin tyhjä kokoelma"
 
-#: ../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 "Poista solmu {0}"
 
-#: ../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 "Poista polku {0}"
 
-#: ../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 "Poistetaan relaatio {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
 #, java-format
 msgid "Delete {0} object"
@@ -3900,5 +3927,5 @@
 msgstr[1] "Poista {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} node"
@@ -3907,5 +3934,5 @@
 msgstr[1] "Poista {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -3914,5 +3941,5 @@
 msgstr[1] "Poista {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -3921,13 +3948,15 @@
 msgstr[1] "Poistetaan {0} relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:188
 #, java-format
 msgid "Deleted ''{0}''"
 msgstr "Poistettiin \"{0}\""
 
-#. 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 "Poiston vahvistus"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:431
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3939,14 +3968,5 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../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 "Poiston vahvistus"
-
-#. 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 "
@@ -4167,4 +4187,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}''"
@@ -4172,19 +4193,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 "Virheellinen pituuspiiri ''{0}''"
 
-#: ../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 "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui"
 
-#: ../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 "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4195,5 +4217,5 @@
 "hakemisto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4204,5 +4226,5 @@
 "hakemisto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4213,5 +4235,5 @@
 "voitu luoda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4222,5 +4244,5 @@
 "voitu luoda: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4230,5 +4252,5 @@
 "asetustiedosto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4239,5 +4261,5 @@
 "asetustiedostolla."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4248,5 +4270,5 @@
 "palauttaa oletusarvoihin: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4257,5 +4279,5 @@
 "<br> ja luodaan uusi oletusarvoinen asetustiedosto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4264,5 +4286,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}"
@@ -4336,20 +4358,20 @@
 msgstr "Projisoidut koordinaatit"
 
-#: ../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 "E"
 
-#: ../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 "P"
 
-#: ../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 "L"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4367,5 +4389,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}."
@@ -4373,5 +4395,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}."
@@ -4391,5 +4413,5 @@
 msgstr "Objekti, jonka tunniste on 0, ei voi olla näkymätön"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346
 #, java-format
 msgid ""
@@ -4397,5 +4419,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817
 #, java-format
 msgid ""
@@ -4464,5 +4486,5 @@
 msgstr "Polut risteävät keskenään"
 
-#: ../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 "
@@ -4471,5 +4493,5 @@
 "Objekteja ei voi yhdistää, koska jompikumpi niistä on uusi, mutta toinen ei"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952
 #, java-format
 msgid ""
@@ -4482,5 +4504,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"
@@ -4503,6 +4525,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"
@@ -4846,5 +4868,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 ""
@@ -4874,4 +4896,9 @@
 msgid "Running test {0}"
 msgstr "Ajetaan testiä {0}"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/ChangePropertyKeyCommand.java:74
@@ -4927,71 +4954,98 @@
 msgstr "Risteävät polut"
 
-#: ../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 "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../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 "Päällekkäiset pisteet"
 
-#: ../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 "Pisteet samassa paikassa"
@@ -5054,54 +5108,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 "Monimonikulmio"
 
-#: ../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 "Tämä testi tarkistaa monimonikulmioiden kelpoisuuden"
 
-#: ../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 "Monimonikulmion ulompi polku puuttuu"
 
-#: ../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 "Monimonikulmion tyyli puuttuu"
 
-#: ../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 "Monimonikulmiosuhteen tyyli puuttuu"
 
-#: ../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 "Monimonikulmiota ei ole suljettu"
 
-#: ../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 "Monimonikulmion sisempi polku on ulkopuolella"
 
-#: ../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 "Monimonikulmion polut risteävät keskenään"
 
-#: ../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 "Monimonikulmion jäsenellä ei ole käyttökelpoista roolia"
 
-#: ../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 "Muu kuin polku monimonikulmiossa"
@@ -5137,4 +5191,9 @@
 "kaksoiskappaleita)"
 
+#: ../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."
@@ -5147,29 +5206,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103
-msgid "Overlapping areas"
-msgstr "Päällekkäiset alueet"
-
-#: ../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 "Tiet alueiden kanssa päällekkäin"
 
-#: ../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 "Radat alueiden kanssa päällekkäin"
 
-#: ../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 "Polut alueiden kanssa päällekkäin"
 
-#: ../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 "Päällekkäiset tiet"
 
-#: ../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 "Päällekkäiset radat"
 
-#: ../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 "Päällekkäiset polut"
@@ -5376,7 +5431,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
@@ -5397,7 +5452,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
@@ -5423,5 +5478,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."
@@ -5586,49 +5641,49 @@
 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 "Sulkemattomat polut"
 
-#: ../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 ""
 "Etsii polkuja, joiden pitäisi tagiensa perusteella olla suljettuja alueita."
 
-#: ../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 "tyyppiä natural {0}"
 
-#: ../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 "tyyppiä maankäyttö {0}"
 
-#: ../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 ""
 
-#: ../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}"
@@ -5676,7 +5731,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"
@@ -5688,10 +5743,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 "alue"
 
-#: ../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 ""
@@ -5822,7 +5877,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}]"
@@ -5862,14 +5917,15 @@
 msgstr "Älä näytä uudestaan (muistaa valinnan)"
 
-#: ../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 "keskeneräinen"
 
 #. 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}"
@@ -5878,6 +5934,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}"
@@ -5885,12 +5941,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 "tie"
@@ -5898,17 +5954,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 "rata"
 
-#: ../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 "vesiväylä"
 
-#: ../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 "maankäyttö"
@@ -5917,8 +5973,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
@@ -5929,6 +5985,6 @@
 msgstr[1] "{0} pistettä"
 
-#: ../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"
@@ -5937,9 +5993,9 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr "julkinen liikenne"
 
-#: ../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
@@ -6045,5 +6101,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 "Kuvatasot"
@@ -6284,5 +6340,5 @@
 msgstr "Asetus {0} on poistettu koska sitä ei enää tarvita."
 
-#: ../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"
@@ -6290,10 +6346,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 "Näytä"
 
-#: ../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
@@ -6302,5 +6358,5 @@
 msgstr "Työkalut"
 
-#: ../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
@@ -6308,5 +6364,5 @@
 msgstr "Esivalinnat"
 
-#: ../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
@@ -6317,5 +6373,5 @@
 msgstr "Valikko: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Ääni"
@@ -6352,5 +6408,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"
@@ -6358,5 +6414,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"
@@ -6515,5 +6571,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
@@ -6698,5 +6754,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
@@ -6706,5 +6762,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"
@@ -6714,5 +6770,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 "Jäsenet"
@@ -6950,5 +7006,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
@@ -7086,4 +7142,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 "poistettu"
@@ -7155,6 +7212,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
@@ -7176,6 +7233,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
@@ -7285,5 +7342,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"
@@ -7367,5 +7424,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
@@ -7377,5 +7434,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
@@ -7523,9 +7580,9 @@
 msgstr "Näytä vain tagit joissa useita arvoja"
 
-#: ../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 "Vain valittujen kohteiden"
 
-#: ../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."
@@ -7536,18 +7593,18 @@
 "<br>Ilman rastia näytetään kaikki aktiivisen tason muutoskokoelmat.</html>"
 
-#: ../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 "Muutoskokoelmat"
 
-#: ../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 "Avaa aktiivisen tason muutoskokoelmat"
 
-#: ../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 "Valitse kaikki objektit jotka ovat valitussa muutoskokoelmassa"
 
-#: ../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
@@ -7555,23 +7612,23 @@
 msgstr "Lataa"
 
-#: ../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 "Lataa valittujen muutoskokoelmien tiedot OSM-palvelimelta"
 
-#: ../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 "Sulkee valitut avoimet muutoskokoelmat"
 
-#: ../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 "Näytä tiedot"
 
-#: ../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 "Avaa webbisivu jokaiselle valitulle muutoskokoelmalle"
 
 #. 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
@@ -7579,5 +7636,5 @@
 msgstr "Yksityiskohtaiset tiedot"
 
-#: ../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 "Avaa valitut muutoskokoelmat muutoskokoelmien hallintaikkunaan"
@@ -7597,12 +7654,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
@@ -7652,5 +7709,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
@@ -7834,19 +7891,13 @@
 "</p><p>Saat kaikki kohteet näkyviin sulkemalla suodinpaneelin.<p></html>"
 
-#: ../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 "Historia"
-
-#: ../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 "Näytä valittujen kohteiden historia."
 
-#: ../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 "Kohde historialla"
 
-#: ../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
@@ -7856,10 +7907,10 @@
 msgstr "Lataa uudelleen"
 
-#: ../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 "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
 
 #. 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
@@ -7871,149 +7922,140 @@
 msgstr "Näytä"
 
-#: ../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 "Näytä valittujen objektien historia"
 
-#: ../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 "Kohteen tarkat tiedot"
 
-#: ../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; "
-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}"
+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
-#, 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
+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 "<uusi objekti>"
 
-#: ../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"
+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 "; 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}"
+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: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 ""
@@ -8023,5 +8065,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 ""
@@ -8030,5 +8072,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 ""
@@ -8038,5 +8080,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -8045,22 +8087,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 ""
@@ -8078,5 +8120,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
@@ -8088,10 +8130,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
@@ -8168,5 +8210,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 "Näytä/piilota"
@@ -8185,5 +8227,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 "Aktivoi"
@@ -8217,9 +8259,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 "Siirrä valittu taso rivi ylöspäin."
 
-#: ../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 "Siirrä valittu taso rivi alaspäin."
@@ -8292,5 +8334,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"
@@ -8333,24 +8375,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 "Relaatiot"
 
-#: ../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 "Näyttää kaikki relaatiot luettelona"
 
-#: ../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 "Avaa valittu relaatio muokkaimeen"
 
-#: ../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 "Poista valittu relaatio"
 
-#: ../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
@@ -8359,5 +8401,5 @@
 msgstr "Tee uusi relaatio"
 
-#: ../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
@@ -8365,133 +8407,125 @@
 msgstr "Tee kopio tästä relaatiosta, ja avaa se muokkaimeen"
 
-#: ../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 "Korvaa nykyinen valinta valituilla relaatioilla"
 
-#: ../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 "Valitse relaatio"
 
-#: ../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 "Valitse kaikkien valittujen relaatioiden jäsenet"
 
-#: ../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 "Valitse jäsenet"
 
-#: ../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 "Lataa valittujen relaatioiden kaikki jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Download members"
 msgstr "Lataa jäsenet"
 
-#: ../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 "Lataa valittujen relaatioiden epätäydelliset jäsenet"
 
-#: ../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 "Hae lataamattomat jäsenet"
 
-#: ../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 "Relaatiot: {0} kpl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: ../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:67
+msgid "Selection"
+msgstr "Valinta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+msgid "Open a selection list window."
+msgstr "Avaa valintaikkuna."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 msgid "Current Selection"
 msgstr "Tämänhetkinen valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "Avaa valintaikkuna."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254
 msgid "Search for objects"
 msgstr "Etsi kohteita"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308
 #: ../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 "Sovita näkymä valintaan"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
 #: ../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 "Sovita näkymä valittuihin kohteisiin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:374
 msgid "Call editor for relation"
 msgstr "Avaa relaatiomuokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:376
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
 msgid "Call relation editor for selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1226
+#: ../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 "Valitse relaatioluettelosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:404
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1227
+#: ../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 "Valitse relaatio relaatioluettelosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:454
-#: ../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
-msgid "Selection"
-msgstr "Valinta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:464
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{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 "Valinta: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
-msgid "Get detailed information on the internal state of the objects."
-msgstr "Hae tarkat tiedot kohteiden sisäisestä tilasta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
-msgid "Inspect"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
@@ -8578,6 +8612,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
-msgid "Validation results"
+msgid "Validation Results"
 msgstr ""
 
@@ -8585,4 +8618,8 @@
 msgid "Open the validation window."
 msgstr "Avaa tarkistusikkuna."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
+msgid "Validation results"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -8937,4 +8974,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" />
@@ -8990,8 +9032,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" />
@@ -9776,5 +9814,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
@@ -9785,179 +9823,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
@@ -10380,9 +10419,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 "Lisää ominaisuuksia"
 
-#: ../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."
@@ -10391,14 +10430,14 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../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 "Tyhjä arvo poistaa avaimen."
 
-#: ../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
@@ -10410,5 +10449,5 @@
 msgstr "<eri>"
 
-#: ../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?"
@@ -10416,13 +10455,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 ""
@@ -10431,5 +10470,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
@@ -10439,5 +10478,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."
@@ -10446,31 +10485,31 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../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 "Valitse avain"
 
-#: ../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 "Valitse arvo"
 
-#: ../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 "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
-#: ../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 "Ominaisuudet/jäsenyydet"
 
-#: ../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 "Valittujen objektien ominaisuudet."
 
 #. 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"
@@ -10479,63 +10518,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 "Ominaisuudet: {0} / Jäsenyydet: {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 "Ominaisuudet / Jäsenyydet"
 
-#: ../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 "Muuta relaatiota"
 
-#: ../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 "Poista relaatiosta"
 
-#: ../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 "Poistetaanko valinta relaatiosta {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 "Poista valittu avain kaikista objekteista"
 
-#: ../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 "Poista asetukset"
 
-#: ../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 "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../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 "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../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 "Valitse relaatio päävalinnasta"
 
-#: ../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 ""
 
@@ -11032,57 +11095,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 "Luo kirjanmerkki"
 
-#: ../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 "Luo kirjanmerkki valitusta latausalueesta"
 
-#: ../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 "Syötä nimi kirjanmerkille"
 
-#: ../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 "Poista valitut kirjanmerkit"
 
-#: ../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 "Nimeä valitut kirjanmerkit uudelleen"
 
-#: ../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 "
@@ -11092,10 +11155,10 @@
 "tähän ladataksesi alueen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "Rajoittava alue"
 
-#: ../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
@@ -11104,15 +11167,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"
@@ -11189,13 +11252,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 ""
 
@@ -11244,7 +11298,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"
@@ -11260,12 +11319,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
@@ -11348,4 +11408,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"
@@ -11383,5 +11445,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 "Koordinaatit"
@@ -11406,10 +11468,10 @@
 msgstr "Päivitä historia palvelimelta"
 
-#: ../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 "Historiaa ei ole vielä alustettu. Verrokkiobjektia ei voitu asettaa."
 
-#: ../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 ""
@@ -11417,5 +11479,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 ""
@@ -11423,9 +11485,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 "Historiaa ei ole vielä alustettu. Nykyistä objektia ei voitu asettaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:318
 #, java-format
 msgid ""
@@ -11508,13 +11570,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 "Muutoskokoelman tiedot"
 
-#: ../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 "Avaa muutoskokoelman tiedot selaimessa"
 
-#: ../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}"
@@ -12111,5 +12173,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
@@ -12121,11 +12183,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 "Taso"
@@ -12145,5 +12207,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 "Lähetä"
@@ -12166,5 +12228,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
@@ -12177,5 +12239,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 "Uuden muutoskokoelman tagit"
@@ -12194,30 +12256,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 "Lähetä muutokset"
 
-#: ../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 "Lähetä muutokset"
 
-#: ../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 "
@@ -12228,33 +12290,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 "Peruuta lähetys ja jatka muokkausta"
 
-#: ../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}"
@@ -12624,5 +12686,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
@@ -12983,5 +13045,5 @@
 msgstr "Löytyneet virheet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
 #, java-format
 msgid ""
@@ -12991,65 +13053,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 ""
@@ -13064,45 +13126,19 @@
 msgstr "Ei virheitä"
 
-#: ../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"
@@ -13111,58 +13147,58 @@
 "resoluutiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../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:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:638
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:643
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:713
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:667
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:672
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:729
+#: ../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:730
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684
 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 "Virhe ladattaessa tiedostoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:735
 msgid "Set WMS Bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:827
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781
 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}"
@@ -13533,5 +13569,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"
@@ -13730,4 +13769,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 ""
@@ -13873,4 +13913,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"
@@ -13948,8 +13990,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 ""
 
@@ -14301,26 +14339,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 "Nimeämätön kuvataso"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:95
 msgid "WMS"
 msgstr "WMS"
 
-#: ../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"
@@ -14328,49 +14366,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 "Kuvatason URL-osoite"
 
-#: ../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 ""
@@ -14580,5 +14617,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}"
@@ -14715,5 +14752,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
@@ -14781,5 +14818,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 "Auto"
@@ -14805,14 +14842,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 "Polkupyörä"
@@ -14851,13 +14888,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 "Jalankulku (foot)"
@@ -15009,113 +15046,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 "kuvatason häivytys"
 
-#: ../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 "Kuvatasojen asetukset"
 
-#: ../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 "Muokkaa Kuvatasot-valikossa näkyvää listaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274
 msgid "Imagery providers"
 msgstr "Kuvatasojen tarjoajat"
 
-#: ../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
@@ -15126,55 +15167,55 @@
 msgstr "Uusi"
 
-#: ../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 "Lisää kuvatason URL-osoite"
 
-#: ../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 "Kuvatason URL-osoite (oletus)"
 
-#: ../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 ""
@@ -15754,7 +15795,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 "Nollaa"
@@ -16307,5 +16350,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 ""
@@ -16314,5 +16357,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 ""
@@ -16352,28 +16395,28 @@
 msgstr "Lisäominaisuudet:"
 
-#: ../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 "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
 
-#: ../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 "Käytä esivalintaa ”{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 "Tuntematon tyyppi: {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
@@ -16383,15 +16426,15 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../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 "Virhe käsiteltäessä {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 ""
 
-#: ../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
@@ -16401,22 +16444,22 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../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"
@@ -16481,4 +16524,41 @@
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
 msgstr "Arvo ei ole OSM ID-numero. Anna positiivinen kokonaisluku."
+
+#: ../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 ""
+"Relaatio, jonka ulkoinen tunniste on \"{0}\", viittaa puuttuvaan objktiin, "
+"jonka ulkoinen tunniste on \"{1}\"."
+
+#: ../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 "Poistettuun jäseneen {0} viitataan relaatiosta {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -17070,5 +17150,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
@@ -17186,5 +17266,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
@@ -17195,5 +17274,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
@@ -17221,4 +17300,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
@@ -17264,14 +17344,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
@@ -17281,10 +17361,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
@@ -17293,5 +17374,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
@@ -17301,16 +17382,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 "Poistetulla relaatiolla {0} on jäseniä"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
 #, java-format
@@ -17318,5 +17394,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
@@ -17325,5 +17401,5 @@
 "Relaation {0} jäsenen \"ref\"-attribuutille saatiin virheellinen arvo: {1}"
 
-#: ../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
@@ -17332,5 +17408,5 @@
 msgstr "Relaation {1} jäseneltä {0} puuttuu \"type\"-attribuutti."
 
-#: ../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
@@ -17342,21 +17418,15 @@
 "{2}"
 
-#: ../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 "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../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 "Poistetulla relaatiolla {0} on jäseniä"
-
-#: ../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
@@ -17365,5 +17435,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
@@ -17371,6 +17441,6 @@
 msgstr "Virheellinen objekti (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
@@ -17384,8 +17454,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
@@ -17399,5 +17469,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
@@ -17405,5 +17475,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
@@ -17412,6 +17482,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
@@ -17425,6 +17495,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
@@ -17435,5 +17505,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
@@ -17442,5 +17512,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
@@ -17449,54 +17519,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 ""
-"Relaatio, jonka ulkoinen tunniste on \"{0}\", viittaa puuttuvaan objktiin, "
-"jonka ulkoinen tunniste on \"{1}\"."
-
-#: ../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 "Poistettuun jäseneen {0} viitataan relaatiosta {1}"
-
-#: ../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 "Valmistellaan OSM-karttatietoja..."
 
-#: ../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
@@ -17651,4 +17686,33 @@
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "Havaittiin OSM-objektille odottamaton tunniste \"0\"."
+
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "OSM-palvelintiedostot"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "Virheellinen päivämäärä"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "Muutoskokoelmaa {0} suljetaan"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, fuzzy, java-format
+msgid "Invalid timestamp: {0}"
+msgstr "Virheellinen aikavyöhyke"
+
+#: ../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 "Ladataan OSM-karttatietoja..."
 
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
@@ -17674,11 +17738,4 @@
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
-#: ../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
@@ -17694,29 +17751,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 ""
 
@@ -18491,10 +18523,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 "Käännöstä ei löydy: {0}. Käytetään oletusasetusta: {1}."
 
-#: ../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
@@ -18504,5 +18536,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
@@ -18511,6 +18543,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 ""
@@ -18545,5 +18577,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18556,5 +18588,5 @@
 "\n"
 
-#: ../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"
@@ -18564,5 +18596,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18573,5 +18605,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 "(Vihje: Voit muokata pikanäppäimiä asetuksista.)"
@@ -19213,16 +19245,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 "
@@ -19232,15 +19269,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 "
@@ -19250,5 +19287,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -19257,10 +19294,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 "
@@ -19269,10 +19306,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 "
@@ -19281,5 +19318,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."
@@ -19287,5 +19324,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 "
@@ -19295,5 +19332,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 "
@@ -19303,25 +19340,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. "
@@ -19330,5 +19367,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 "
@@ -19338,15 +19375,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"
@@ -19354,5 +19391,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."
@@ -19360,10 +19397,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 "
@@ -19372,5 +19409,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 "
@@ -19379,15 +19416,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."
@@ -19395,25 +19432,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 "Lisää &quot;Uudelleenkäynnistä JOSM&quot;-valinnan Tiedosto-valikkoon."
 
 #. Plugin reverter
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Plugin for reverting changesets"
 msgstr "Liitännäinen muutoskokoelmien muutosten palauttamiseen ennalleen"
 
 #. 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 "
@@ -19423,5 +19460,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 "
@@ -19430,10 +19467,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 "
@@ -19443,20 +19480,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 "
@@ -19466,15 +19503,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). "
@@ -19483,5 +19520,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) "
@@ -19490,10 +19527,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."
@@ -19501,5 +19538,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19508,15 +19545,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 "
@@ -19526,5 +19563,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19533,20 +19570,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 "
@@ -19711,9 +19748,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 "Numero"
@@ -19766,6 +19803,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 "Maksiminopeus (km/h)"
@@ -19814,9 +19851,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 "Yksisuuntainen"
@@ -19866,9 +19903,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 "Silta"
@@ -19909,9 +19946,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 "Tunneli"
@@ -19950,9 +19987,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 "Maaleikkaus"
@@ -19991,9 +20028,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 "Penger"
@@ -20032,9 +20069,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 ""
@@ -20120,4 +20157,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"
@@ -20135,8 +20173,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 ""
@@ -20156,4 +20195,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
@@ -20171,8 +20211,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 ""
@@ -20192,4 +20233,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
@@ -20207,8 +20249,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 ""
@@ -20228,4 +20271,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
@@ -20243,8 +20287,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 ""
@@ -20264,4 +20309,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
@@ -20279,8 +20325,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 ""
@@ -20353,5 +20400,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 ""
@@ -20383,10 +20430,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 ""
@@ -20428,9 +20475,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 "Pinta"
@@ -20455,9 +20502,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 "päällystetty"
@@ -20481,9 +20528,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 "päällystämätön"
@@ -20507,9 +20554,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 ""
@@ -20534,9 +20581,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 ""
@@ -20561,9 +20608,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 ""
@@ -20583,4 +20630,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
@@ -20589,10 +20637,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 "metsä"
@@ -20616,9 +20664,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 ""
@@ -20643,9 +20691,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 "mukulakivi"
@@ -20670,9 +20718,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 "sora"
@@ -20696,9 +20744,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 ""
@@ -20722,9 +20770,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 ""
@@ -20748,9 +20796,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 ""
@@ -20775,9 +20823,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 "ruoho"
@@ -20802,9 +20850,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 "hiekka"
@@ -20830,10 +20878,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 "maa"
@@ -20984,5 +21032,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 "kiertoliittymä"
@@ -21136,64 +21184,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
@@ -21269,8 +21317,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"
@@ -21300,8 +21348,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 ""
@@ -21351,9 +21399,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"
@@ -21396,9 +21444,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"
@@ -21419,7 +21467,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 ""
@@ -21439,7 +21487,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 ""
@@ -21579,61 +21627,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
@@ -21667,10 +21715,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 ""
@@ -21702,10 +21750,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 ""
@@ -21724,11 +21772,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 "Hevonen"
@@ -21746,5 +21794,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 ""
@@ -21765,12 +21813,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 "Moottoripyörä"
@@ -21788,10 +21836,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 "Auto"
@@ -21891,6 +21939,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 "moottoritie"
@@ -21898,5 +21946,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 "moottoritien_ramppi"
@@ -21916,6 +21964,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 "valtatie"
@@ -21923,5 +21971,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 "valtatien_ramppi"
@@ -21941,6 +21989,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 "kantatie"
@@ -21948,5 +21996,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 "kantatien_ramppi"
@@ -21966,6 +22014,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 "seututie"
@@ -21985,6 +22033,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 "yhdystie"
@@ -21992,5 +22040,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 "tie"
@@ -22004,6 +22052,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 "asuinkatu"
@@ -22011,5 +22059,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 "pihakatu"
@@ -22050,6 +22098,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 ""
@@ -22057,5 +22105,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 ""
@@ -22080,7 +22128,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 ""
@@ -22116,11 +22164,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "Kahluupaikka"
+
+#. 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 "Polut"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -22129,35 +22188,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 "Muokkaa metsätien ominaisuuksia"
 
 #. 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 ""
@@ -22165,10 +22224,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 ""
@@ -22176,5 +22235,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr "Polku"
@@ -22183,50 +22242,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, "
@@ -22235,5 +22294,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 "
@@ -22243,5 +22302,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 "
@@ -22250,5 +22309,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, "
@@ -22257,5 +22316,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, "
@@ -22265,5 +22324,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"
@@ -22271,10 +22330,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 ""
@@ -22282,15 +22341,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 ""
@@ -22313,23 +22372,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 "Sukset"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr "Moottorikelkka"
@@ -22338,5 +22397,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -22344,5 +22403,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 "Muokkaa ratsastustien ominaisuuksia"
@@ -22350,5 +22409,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -22356,10 +22415,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 ""
@@ -22368,6 +22427,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 ""
@@ -22418,27 +22477,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 ""
@@ -22447,6 +22506,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 ""
@@ -22455,6 +22514,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 ""
@@ -22463,6 +22522,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 ""
@@ -22471,6 +22530,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 ""
@@ -22479,21 +22538,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 ""
@@ -22501,15 +22560,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 ""
@@ -22527,11 +22586,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 "Muokkaa pyörätietä/kevyen liikenteen väylää"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr ""
@@ -22539,5 +22598,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22545,5 +22604,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22551,5 +22610,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr ""
@@ -22558,5 +22617,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 "Muokkaa jalkakäytävän ominaisuuksia"
@@ -22564,5 +22623,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "Portaat"
@@ -22572,10 +22631,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 "Muokkaa portaiden ominaisuuksia"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr ""
@@ -22583,5 +22642,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"
@@ -22589,5 +22648,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -22595,10 +22654,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 "Muokkaa moottoritien liittymää"
 
 #. 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
@@ -22607,10 +22666,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 ""
@@ -22618,5 +22677,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 ""
@@ -22710,42 +22769,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 "Operaattori"
@@ -22754,6 +22813,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 "Käymälä"
@@ -22761,5 +22820,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -22767,5 +22826,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 ""
@@ -22773,5 +22832,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -22781,5 +22840,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -22789,5 +22848,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 "Suojatien tyyppi"
@@ -22796,6 +22855,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 "valvomaton"
@@ -22804,6 +22863,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 "liikennevalot"
@@ -22812,6 +22871,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 "saari"
@@ -22820,6 +22879,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 "merkitsemätön"
@@ -22828,6 +22887,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 "Ylitys ratsain"
@@ -22836,6 +22895,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 "Ylitys pyörällä"
@@ -22844,11 +22903,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 "Suojatien valvoja"
 
 #. 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 "Suojatien tyyppi (Iso-Britannia)"
@@ -22856,5 +22915,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 ""
@@ -22862,5 +22921,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 ""
@@ -22868,5 +22927,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 ""
@@ -22874,5 +22933,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 ""
@@ -22880,5 +22939,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 ""
@@ -22886,5 +22945,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 ""
@@ -22892,5 +22951,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr ""
@@ -22898,5 +22957,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr ""
@@ -22907,15 +22966,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 "Suojatie"
@@ -22924,15 +22983,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 "Muokkaa suojatietä"
 
 #. 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 "Liikennehidastin"
@@ -22940,40 +22999,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 "Muokkaa liikennehidastinta"
 
 #. 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 ""
@@ -22981,5 +23040,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 ""
@@ -22987,5 +23046,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 "Kääntöympyrä"
@@ -22995,5 +23054,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 "Kuntaraja"
@@ -23001,15 +23060,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 "Muokkaa kuntarajakylttiä"
 
 #. 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 "Nopeuskamera"
@@ -23019,5 +23078,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr ""
@@ -23026,17 +23085,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "Kahluupaikka"
-
-#. 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 ""
@@ -23044,5 +23092,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 ""
@@ -23054,7 +23102,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 "Korkeus"
@@ -23089,18 +23137,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 ""
@@ -23108,5 +23156,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Esteet"
@@ -23114,5 +23162,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr ""
@@ -23120,5 +23168,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 ""
@@ -23168,27 +23216,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 "Sallitut kulkumuodot:"
 
 #. 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 ""
@@ -23196,10 +23244,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 ""
@@ -23207,15 +23255,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 ""
@@ -23223,5 +23271,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 ""
@@ -23229,10 +23277,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 ""
@@ -23241,5 +23289,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -23248,24 +23296,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr "Aita"
 
-#. <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 "Muuri"
@@ -23273,5 +23340,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -23280,5 +23347,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 ""
@@ -23289,15 +23356,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 "Portti"
@@ -23305,50 +23372,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 "Tikkaat"
@@ -23356,25 +23423,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 "Muokkaa tikkaita"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1052
 msgid "Turnstile"
 msgstr "Pyöröportti"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1053
 msgid "Edit Turnstile"
 msgstr "Muokkaa pyöröporttia"
 
 #. 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 ""
@@ -23384,6 +23451,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 "Vesi"
@@ -23391,5 +23458,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr ""
@@ -23397,10 +23464,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 ""
@@ -23408,10 +23475,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 ""
@@ -23419,10 +23486,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 "Kanava"
@@ -23430,10 +23497,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 "Joki"
@@ -23443,5 +23510,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 "Muokkaa joen ominaisuuksia"
@@ -23449,5 +23516,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Lähde"
@@ -23455,20 +23522,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 "Muokkaa lähteen ominaisuuksia"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "Ylisyöksypato"
@@ -23476,10 +23543,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 "Muokkaa ylisyöksypatoa"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Pato"
@@ -23487,10 +23554,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 ""
@@ -23498,5 +23565,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 ""
@@ -23506,15 +23573,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
+#: build/trans_presets.java:1159
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
 #: build/trans_presets.java:1160
-msgid "Basin"
-msgstr ""
-
-#. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -23522,15 +23589,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 "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1172
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #: build/trans_presets.java:1173
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -23538,20 +23605,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 "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "Maa"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -23559,10 +23626,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 "Muokkaa rantaviivan ominaisuuksia"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -23571,5 +23638,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 "Muokkaa joentörmän ominaisuuksia"
@@ -23577,5 +23644,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -23586,15 +23653,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 "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "suo"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr "räme"
@@ -23607,40 +23674,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 "suo"
 
 #. 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 "Muta"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Ranta"
@@ -23648,20 +23715,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 "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Lahti"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "Kallio"
@@ -23669,15 +23736,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 "Muokkaa kallion ominaisuuksia"
 
 #. 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 "Lauttaterminaali"
@@ -23685,20 +23752,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 "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. 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 ""
@@ -23784,26 +23851,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 "polkupyörä"
 
 #. 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 "Lauttareitti"
@@ -23811,5 +23878,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 ""
@@ -23818,15 +23885,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Venesatama"
 
 #. 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 "Laituri"
@@ -23834,10 +23901,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 "Muokkaa laiturin ominaisuuksia"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -23846,5 +23913,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 ""
@@ -23854,5 +23921,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr ""
@@ -23862,10 +23929,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 ""
@@ -23873,10 +23940,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 "Telakka"
@@ -23884,20 +23951,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:1299
+#: build/trans_presets.java:1298
 msgid "Transport"
 msgstr "Liikenne"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1299
 msgid "Railway"
 msgstr "Rata"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "Rata"
@@ -23905,5 +23972,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 ""
@@ -23933,7 +24000,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 ""
@@ -23949,8 +24016,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 ""
@@ -23964,8 +24031,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 ""
@@ -23979,8 +24046,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 "sivuraide"
@@ -23994,8 +24061,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 ""
@@ -24008,8 +24075,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 ""
@@ -24022,8 +24089,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 ""
@@ -24052,4 +24119,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
@@ -24084,12 +24158,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
@@ -24107,9 +24182,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 "Jännite"
@@ -24122,8 +24197,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 ""
@@ -24136,8 +24211,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 ""
@@ -24145,10 +24220,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1313
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:1314
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
@@ -24156,5 +24231,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "Monorail"
@@ -24162,5 +24237,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 ""
@@ -24168,10 +24243,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1337
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1338
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
@@ -24179,10 +24254,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1349
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1350
 msgid "Edit Light Rail"
 msgstr ""
@@ -24190,10 +24265,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
@@ -24201,10 +24276,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr ""
@@ -24212,5 +24287,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr ""
@@ -24218,5 +24293,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 ""
@@ -24225,10 +24300,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
@@ -24237,10 +24312,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 "Purettu rata"
@@ -24249,5 +24324,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -24256,5 +24331,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr "Risteys"
@@ -24264,5 +24339,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr "Risteystyyppi"
@@ -24270,5 +24345,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -24277,5 +24352,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 ""
@@ -24284,10 +24359,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -24295,5 +24370,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 ""
@@ -24315,12 +24390,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 ""
@@ -24346,14 +24421,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 ""
@@ -24371,10 +24446,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 ""
@@ -24382,5 +24457,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 ""
@@ -24390,6 +24465,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 ""
@@ -24397,5 +24472,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -24403,5 +24478,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 "Muokkaa hiihtohissin ominaisuuksia"
@@ -24409,5 +24484,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -24415,10 +24490,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 "Muokkaa köysiradan ominaisuuksia"
 
 #. 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 ""
@@ -24426,5 +24501,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr ""
@@ -24432,10 +24507,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 ""
@@ -24443,5 +24518,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24449,10 +24524,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 ""
@@ -24460,5 +24535,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24466,5 +24541,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 ""
@@ -24472,5 +24547,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24478,5 +24553,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 ""
@@ -24484,5 +24559,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24490,5 +24565,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 ""
@@ -24496,5 +24571,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24502,5 +24577,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 ""
@@ -24508,5 +24583,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24514,5 +24589,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 ""
@@ -24520,5 +24595,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24526,5 +24601,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24534,5 +24609,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24541,5 +24616,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"
@@ -24547,5 +24622,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24554,5 +24629,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"
@@ -24570,6 +24645,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 "Pysäköinti"
@@ -24578,5 +24653,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 "Muokkaa pysäköinnin ominaisuuksia"
@@ -24584,5 +24659,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 "monikerroksinen"
@@ -24590,5 +24665,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 ""
@@ -24596,10 +24671,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 "maanalainen"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr ""
@@ -24610,7 +24685,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 "Maksu"
@@ -24618,25 +24693,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1595
 msgid "Capacity (overall)"
 msgstr "Paikkoja (yhteensä)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1596
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
 #. item "Car/Parking" combo "Spaces for Women"
+#: build/trans_presets.java:1597
+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 ""
@@ -24644,5 +24719,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -24652,5 +24727,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 "Muokkaa huoltoaseman ominaisuuksia"
@@ -24663,117 +24738,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 ""
@@ -24866,48 +24941,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 "Aukioloajat"
@@ -24998,47 +25073,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 ""
@@ -25130,47 +25205,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 ""
@@ -25240,126 +25315,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 ""
@@ -25367,5 +25442,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -25373,20 +25448,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 "Autopesula"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
@@ -25394,5 +25469,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr ""
@@ -25400,5 +25475,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 "Muokkaa autokaupan ominaisuuksia"
@@ -25406,20 +25481,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 "Korjaamo"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
 
 #. 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 ""
@@ -25427,5 +25502,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 ""
@@ -25469,15 +25544,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 "Puhelinnumero"
@@ -25502,14 +25577,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 ""
@@ -25537,15 +25612,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 "Verkkosivu"
@@ -25570,14 +25645,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 ""
@@ -25587,6 +25662,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 "Vuokraamo"
@@ -25595,10 +25670,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 "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr ""
@@ -25606,5 +25681,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 ""
@@ -25613,16 +25688,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 "Paikkoja"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1700
 msgid "Edit Motorcycle Parking"
 msgstr "Muokkaa moottoripyöräparkkia"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
 msgstr "Moottoripyöräkauppa"
@@ -25630,25 +25705,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 "Muokkaa moottoripyöräkauppaa"
 
 #. 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"
@@ -25656,5 +25731,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25662,5 +25737,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25668,5 +25743,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25677,6 +25752,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 ""
@@ -25684,35 +25759,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 ""
@@ -25722,6 +25797,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 "Vaatteet"
@@ -25729,10 +25804,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 "Muokkaa pyörätelineen ominaisuuksia"
 
+#. 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 ""
@@ -25741,40 +25862,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 "Pyöräkauppa"
 
 #. 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 ""
@@ -25783,10 +25904,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 "Muokkaa polkupyörävuokraamon ominaisuuksia"
 
 #. 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"
@@ -25794,5 +25915,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -25802,5 +25923,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"
@@ -25808,5 +25929,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr ""
@@ -25814,5 +25935,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -25820,5 +25941,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 "Muokkaa rautatien seisaketta"
@@ -25826,5 +25947,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -25833,5 +25954,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 "Muokkaa raitiovaunupysäkkiä"
@@ -25839,5 +25960,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -25846,5 +25967,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 "Muokkaa laiturin asetuksia"
@@ -25856,5 +25977,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 ""
@@ -25863,11 +25984,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 "Alue"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -25876,5 +25997,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 "Muokkaa sisäänkäynnin ominaisuuksia"
@@ -25882,5 +26003,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 "Pyörätuoli"
@@ -25889,5 +26010,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -25896,5 +26017,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 "Muokkaa linja-autoaseman ominaisuuksia"
@@ -25902,5 +26023,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -25910,5 +26031,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 "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -25917,6 +26038,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
@@ -25928,10 +26049,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 "Penkki"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
 msgstr ""
@@ -25939,10 +26060,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 ""
@@ -25950,10 +26071,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 ""
@@ -25962,6 +26083,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 "Kolikot"
@@ -25970,6 +26091,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 ""
@@ -25978,6 +26099,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 ""
@@ -25986,6 +26107,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 ""
@@ -25994,6 +26115,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 "Luottokortit"
@@ -26001,10 +26122,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 "Taksi"
@@ -26012,5 +26133,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 "Muokkaa taksitolppaa"
@@ -26018,10 +26139,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "Lentokenttä"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
 msgstr ""
@@ -26029,5 +26150,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 ""
@@ -26035,10 +26156,10 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1878
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1879
 msgid "ICAO"
 msgstr "ICAO"
@@ -26047,5 +26168,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr ""
@@ -26053,5 +26174,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 ""
@@ -26059,5 +26180,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr ""
@@ -26065,5 +26186,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 ""
@@ -26071,5 +26192,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr ""
@@ -26077,5 +26198,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 ""
@@ -26085,5 +26206,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 ""
@@ -26093,5 +26214,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 ""
@@ -26102,6 +26223,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 "Loisto"
@@ -26111,5 +26232,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 ""
@@ -26118,5 +26239,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr ""
@@ -26124,10 +26245,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"
@@ -26136,15 +26257,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 ""
@@ -26156,5 +26277,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 "Hotelli"
@@ -26163,5 +26284,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 "Muokkaa hotellia"
@@ -26175,8 +26296,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 "Tähdet"
@@ -26212,12 +26333,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 ""
@@ -26238,12 +26359,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 ""
@@ -26264,12 +26385,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 ""
@@ -26296,12 +26417,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 "terminaali"
@@ -26322,12 +26443,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 ""
@@ -26350,12 +26471,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 ""
@@ -26377,12 +26498,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 ""
@@ -26404,12 +26525,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 ""
@@ -26431,17 +26552,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 "Motelli"
@@ -26449,20 +26570,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 "Muokkaa motellin ominaisuuksia"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -26470,10 +26591,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 "Hostelli"
@@ -26481,15 +26602,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 ""
@@ -26497,10 +26618,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
@@ -26508,30 +26629,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 "Leirintäalue"
@@ -26539,10 +26660,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 "Muokkaa leirintäalueen ominaisuuksia"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -26553,5 +26674,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 "Ravintola"
@@ -26559,5 +26680,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 "Muokkaa ravintolan ominaisuuksia"
@@ -26566,6 +26687,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 ""
@@ -26573,5 +26694,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 "italialainen"
@@ -26579,5 +26700,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 "kiinalainen"
@@ -26585,5 +26706,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 "pizza"
@@ -26591,5 +26712,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 "hampurilainen"
@@ -26597,5 +26718,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 "kreikkalainen"
@@ -26603,5 +26724,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 "saksalainen"
@@ -26609,5 +26730,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 "intialainen"
@@ -26615,5 +26736,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 "paikallinen"
@@ -26621,5 +26742,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 "kebab"
@@ -26627,5 +26748,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 "turkkilainen"
@@ -26633,5 +26754,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 "aasialainen"
@@ -26639,5 +26760,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 "thaimaalainen"
@@ -26645,5 +26766,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 "meksikolainen"
@@ -26651,5 +26772,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 "japanilainen"
@@ -26657,5 +26778,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 ""
@@ -26663,5 +26784,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 ""
@@ -26669,5 +26790,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 ""
@@ -26675,10 +26796,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 "Pikaruoka"
@@ -26686,20 +26807,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 "Muokkaa pikaruokalan ominaisuuksia"
 
 #. 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 ""
@@ -26707,10 +26828,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 "Kahvila"
@@ -26718,15 +26839,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 "Muokkaa kahvilan ominaisuuksia"
 
 #. 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 ""
@@ -26734,20 +26855,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 ""
@@ -26755,10 +26876,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 "Yökerho"
@@ -26766,25 +26887,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 "Muokkaa yökerhon ominaisuuksia"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Turismi"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. 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 "Näköalapaikka"
@@ -26792,10 +26913,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 "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr ""
@@ -26803,20 +26924,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 "Kartta"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr "Tarkkuustaso"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "topograafinen"
@@ -26849,32 +26970,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 "katu"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr "kaavio"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr "Kartan laajuus"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr "paikka"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "kaupunki"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "alue"
@@ -26883,6 +27004,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 "Tarkempi kuvaus"
@@ -26892,5 +27013,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 ""
@@ -26898,5 +27019,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 ""
@@ -26905,6 +27026,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 "Pyöräily"
@@ -26912,5 +27033,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 ""
@@ -26919,6 +27040,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 "Hiihto"
@@ -26926,5 +27047,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 ""
@@ -26932,50 +27053,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 "historia"
 
 #. 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 ""
@@ -26983,10 +27104,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 "Tarkempi kuvaus"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr ""
@@ -26994,25 +27115,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 "Vapaa-ajanviete"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -27021,10 +27142,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 "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -27033,10 +27154,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 "Muokkaa eläintarhan ominaisuuksia"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -27045,45 +27166,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 "Teemapuisto"
 
 #. 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 "Vesipuisto"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr ""
@@ -27093,5 +27214,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 ""
@@ -27119,20 +27240,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 "Pääsy (access)"
@@ -27140,5 +27261,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -27146,15 +27267,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 "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
@@ -27162,10 +27283,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 ""
@@ -27173,15 +27294,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"
@@ -27189,30 +27305,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 "Kalastus"
 
 #. 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 "Museo"
@@ -27220,10 +27331,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 "Muokkaa museon ominaisuuksia"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Teatteri"
@@ -27232,10 +27343,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 "Muokkaa teatterin ominaisuuksia"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Kirjasto"
@@ -27244,10 +27355,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 "Muokkaa kirjaston ominaisuuksia"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -27255,10 +27366,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 "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Taideteos"
@@ -27266,10 +27377,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 ""
@@ -27279,5 +27390,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 ""
@@ -27286,6 +27397,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 "Uskonto"
@@ -27294,6 +27405,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 ""
@@ -27302,6 +27413,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 ""
@@ -27310,6 +27421,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 ""
@@ -27318,6 +27429,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 ""
@@ -27326,6 +27437,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 ""
@@ -27334,6 +27445,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 ""
@@ -27342,6 +27453,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 ""
@@ -27350,6 +27461,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 ""
@@ -27358,6 +27469,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 ""
@@ -27366,6 +27477,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 ""
@@ -27374,6 +27485,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 ""
@@ -27382,6 +27493,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 ""
@@ -27390,6 +27501,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 ""
@@ -27398,6 +27509,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 ""
@@ -27406,6 +27517,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 ""
@@ -27414,6 +27525,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 ""
@@ -27422,6 +27533,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 ""
@@ -27430,6 +27541,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 ""
@@ -27438,6 +27549,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 ""
@@ -27446,6 +27557,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 ""
@@ -27454,6 +27565,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 ""
@@ -27462,6 +27573,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 ""
@@ -27470,6 +27581,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 ""
@@ -27478,6 +27589,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 ""
@@ -27486,6 +27597,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 ""
@@ -27494,6 +27605,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 ""
@@ -27502,6 +27613,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 ""
@@ -27510,36 +27621,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 ""
@@ -27547,15 +27658,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 ""
@@ -27563,5 +27674,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 "Julkinen rakennus"
@@ -27569,10 +27680,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 "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -27580,5 +27691,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 "Muokkaa kaupungintalon ominaisuuksia"
@@ -27587,10 +27698,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 "Suurlähetystö"
@@ -27598,10 +27709,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 "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -27610,10 +27721,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 "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Vankila"
@@ -27622,10 +27733,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 "Muokkaa vankilan ominaisuuksia"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "Poliisiasema"
@@ -27635,10 +27746,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 "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -27647,10 +27758,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 "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -27658,25 +27769,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 "Muokkaa postitoimiston ominaisuuksia"
 
 #. 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 "Lastentarha"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "Koulu"
@@ -27684,10 +27795,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 "Muokkaa koulun ominaisuuksia"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Yliopisto"
@@ -27695,10 +27806,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 "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "Korkeakoulu"
@@ -27706,10 +27817,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 "Muokkaa korkeakoulun ominaisuuksia"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr ""
@@ -27717,20 +27828,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 "Terveys"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Sairaala"
@@ -27738,10 +27849,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 "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -27749,25 +27860,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 "Muokkaa lääkärin ominaisuuksia"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
 #. 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 ""
@@ -27775,5 +27886,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -27781,5 +27892,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 "Muokkaa apteekin ominaisuuksia"
@@ -27787,10 +27898,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 ""
@@ -27798,5 +27909,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 ""
@@ -27804,5 +27915,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr ""
@@ -27810,5 +27921,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 ""
@@ -27816,5 +27927,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr ""
@@ -27823,5 +27934,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 ""
@@ -27830,15 +27941,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 ""
@@ -27847,5 +27958,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -27854,10 +27965,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 "Muokkaa eläinlääkärin ominaisuuksia"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr ""
@@ -27865,15 +27976,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 "Postilaatikko"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Puhelin"
@@ -27882,15 +27993,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 "Muokkaa puhelimen ominaisuuksia"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr ""
@@ -27899,5 +28010,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 ""
@@ -27907,5 +28018,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 ""
@@ -27913,5 +28024,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"
@@ -27920,5 +28031,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"
@@ -27926,5 +28037,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -27932,5 +28043,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -27938,60 +28049,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 ""
@@ -27999,5 +28105,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -28006,5 +28112,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 "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -28012,40 +28118,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. 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 ""
@@ -28053,5 +28159,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 ""
@@ -28060,30 +28166,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"
@@ -28091,5 +28197,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -28097,5 +28203,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -28103,5 +28209,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -28109,5 +28215,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -28115,5 +28221,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -28121,5 +28227,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -28127,20 +28233,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"
@@ -28148,5 +28254,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"
@@ -28154,5 +28260,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"
@@ -28160,5 +28266,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"
@@ -28166,10 +28272,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -28178,10 +28284,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 "Korkeus"
 
 #. 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"
@@ -28189,20 +28295,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 "täysi"
 
 #. 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 ""
@@ -28210,5 +28316,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -28217,10 +28323,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 "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr ""
@@ -28229,5 +28335,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 ""
@@ -28235,5 +28341,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"
@@ -28241,5 +28347,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -28247,5 +28353,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -28253,16 +28359,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"
@@ -28270,5 +28376,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"
@@ -28276,5 +28382,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -28282,26 +28388,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 ""
@@ -28309,20 +28410,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 "Liikunta"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "Liikuntapaikka"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -28336,6 +28437,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 "Valitse urheilulaji:"
@@ -28681,34 +28782,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 "urheilu"
@@ -28718,6 +28819,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 ""
@@ -28727,6 +28828,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 "jousiammunta"
@@ -28736,6 +28837,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 "yleisurheilu"
@@ -28745,6 +28846,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 "amerikkalainen jalkapallo"
@@ -28754,6 +28855,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 "australialainen jalkapallo"
@@ -28763,6 +28864,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 "baseball"
@@ -28772,6 +28873,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 "koripallo"
@@ -28781,6 +28882,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 "kuulapelit"
@@ -28790,6 +28891,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 "nurmikeilailu"
@@ -28799,6 +28900,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 "kanadalainen jalkapallo"
@@ -28808,6 +28909,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 "kanootti"
@@ -28817,6 +28918,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 "kiipeily"
@@ -28826,6 +28927,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 "kriketti"
@@ -28835,6 +28936,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 "krikettiverkko"
@@ -28844,6 +28945,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 "kroketti"
@@ -28853,6 +28954,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 "pyöräily"
@@ -28862,6 +28963,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 "koirakilpailu"
@@ -28871,6 +28972,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 "ratsastus"
@@ -28880,6 +28981,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 "skotlantilainen jalkapallo"
@@ -28889,6 +28990,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 "golf"
@@ -28898,6 +28999,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 "voimistelu"
@@ -28907,6 +29008,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 "jääkiekko"
@@ -28916,6 +29017,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 "hevoskilpailu"
@@ -28925,6 +29026,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 "moottoriurheilu"
@@ -28934,6 +29035,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 "pelota"
@@ -28943,6 +29044,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 "racquet"
@@ -28952,6 +29053,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 "rugby league"
@@ -28961,6 +29062,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 "rugby union"
@@ -28970,6 +29071,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 "ammunta"
@@ -28979,6 +29080,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 "rullalautailu"
@@ -28988,6 +29089,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 "luistelu"
@@ -28997,6 +29098,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 "hiihto"
@@ -29006,6 +29107,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 "jalkapallo"
@@ -29015,6 +29116,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 "uinti"
@@ -29024,6 +29125,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 "pöytätennis"
@@ -29033,71 +29134,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 "tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2764
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. 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 "Muokkaa urheilukeskusta"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. 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 "Muokkaa golf-kentän ominaisuuksia"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2797
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. 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 "Muokkaa minigolfin ominaisuuksia"
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "Urheilu"
 
 #. 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 ""
@@ -29145,25 +29246,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 "tyyppi"
@@ -29213,26 +29314,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 "kenttä"
@@ -29282,26 +29383,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 "urheilukeskus"
@@ -29346,149 +29447,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 "stadion"
 
 #. 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 "Yleisurheilu"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "Muokkaa yleisurheilua"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. 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 "Kiipeily"
 
 #. 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 "Melonta"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "Muokkaa melontaa"
 
 #. 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 "Koirakilpailu"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "Muokkaa koirakilpailua"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. 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 "Hevoskilpailu"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "Muokkaa hevoskilpailua"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. 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 "Luistelu"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Muokkaa luistelua"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr "Rullalautailu"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr "Muokkaa rullalautailua"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr ""
@@ -29496,60 +29597,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 "Muokkaa hiihtoa"
 
 #. 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 "Ammunta"
@@ -29557,105 +29658,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 "Pallopelit"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. 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 "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "Muokkaa australialaista jalkapalloa"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "American Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit American Football"
 msgstr "Muokkaa amerikkalaista jalkapalloa"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2925
 msgid "Canadian Football"
 msgstr "Kanadalainen jalkapallo"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Edit Canadian Football"
 msgstr "Muokkaa kanadalaista jalkapalloa"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2931
 msgid "Gaelic Football"
 msgstr "Skotlantilainen jalkapallo"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Edit Gaelic Football"
 msgstr "Muokkaa skotlantilaista jalkapalloa"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2937
 msgid "Rugby League"
 msgstr "Rugby league"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Edit Rugby League"
 msgstr "Muokkaa rugby leagueta"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2943
 msgid "Rugby Union"
 msgstr "Rugby union"
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Edit Rugby Union"
 msgstr "Muokkaa rugby unionia"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2949
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "Muokkaa baseballia"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. 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 ""
@@ -29663,10 +29764,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 ""
@@ -29674,120 +29775,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 "Golf"
 
 #. 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 "golfkenttä"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr "Nurmikeilailu"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr "Muokkaa nurmikeilailua"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. 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 "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3021
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3022
 msgid "Edit Pelota"
 msgstr "Muokkaa pelotaa"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3027
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3028
 msgid "Edit Racquet"
 msgstr "Muokkaa racquettia"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. 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 "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3040
 msgid "Edit Tennis"
 msgstr ""
@@ -29795,40 +29896,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 "Moottoriurheilu"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3048
 msgid "Edit Motorsport"
 msgstr "Muokkaa moottoriurheilua"
 
 #. 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 "Motocross"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3060
 msgid "Edit Motocross"
 msgstr "Muokkaa motocrossia"
 
 #. 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 ""
@@ -29836,20 +29937,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 ""
@@ -29857,10 +29958,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 "Rakennus"
@@ -29868,25 +29969,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 "Torni"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. 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 ""
@@ -29895,5 +29996,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 ""
@@ -29901,5 +30002,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr ""
@@ -29909,15 +30010,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr ""
@@ -29925,10 +30026,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 "Tuulimylly"
@@ -29936,20 +30037,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 "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "Putki"
@@ -29958,5 +30059,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 "Muokkaa putken ominaisuuksia"
@@ -30000,8 +30101,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
@@ -30011,10 +30112,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 "kaasu"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr ""
@@ -30022,20 +30123,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"
@@ -30043,5 +30144,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"
@@ -30049,5 +30150,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Nosturi"
@@ -30055,10 +30156,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 "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr ""
@@ -30067,25 +30168,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 ""
@@ -30093,5 +30194,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 ""
@@ -30099,5 +30200,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 ""
@@ -30105,5 +30206,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 ""
@@ -30112,6 +30213,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 "kivihiili"
@@ -30119,5 +30220,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 ""
@@ -30125,5 +30226,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 ""
@@ -30131,5 +30232,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 ""
@@ -30137,5 +30238,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 ""
@@ -30143,5 +30244,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 ""
@@ -30149,5 +30250,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 ""
@@ -30155,5 +30256,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 ""
@@ -30161,5 +30262,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 ""
@@ -30167,5 +30268,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 ""
@@ -30173,5 +30274,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 ""
@@ -30179,5 +30280,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 ""
@@ -30185,5 +30286,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 ""
@@ -30191,5 +30292,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 ""
@@ -30197,10 +30298,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 ""
@@ -30208,10 +30309,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 ""
@@ -30219,10 +30320,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 ""
@@ -30230,15 +30331,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. 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 "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr ""
@@ -30246,10 +30347,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 "Vedenpuhdistuslaitos"
@@ -30259,10 +30360,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 "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr ""
@@ -30270,10 +30371,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 "Lähde"
@@ -30282,10 +30383,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 "Muokkaa lähteen ominaisuuksia"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr ""
@@ -30293,5 +30394,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 ""
@@ -30299,5 +30400,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -30305,5 +30406,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 "Muokkaa majakan ominaisuuksia"
@@ -30311,10 +30412,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 "Katulyhty"
@@ -30322,5 +30423,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 "Muokkaa katulyhdyn ominaisuuksia"
@@ -30329,15 +30430,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 ""
@@ -30345,55 +30446,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"
@@ -30401,5 +30502,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr ""
@@ -30407,10 +30508,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 "Valvontakamera"
@@ -30418,30 +30519,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 "Muokkaa valvontakameran ominaisuuksia"
 
 #. 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 ""
@@ -30451,140 +30552,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 "vesivoima"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "ydinvoima"
 
 #. 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 "tuuli"
 
 #. 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 ""
@@ -30592,10 +30693,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 ""
@@ -30610,9 +30711,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 ""
@@ -30627,9 +30728,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 ""
@@ -30644,9 +30745,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 ""
@@ -30661,54 +30762,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 ""
@@ -30717,10 +30818,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 "Muuntamoasema"
@@ -30729,5 +30830,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 "Muokkaa muuntamoaseman ominaisuuksia"
@@ -30735,10 +30836,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 ""
@@ -30747,5 +30848,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 ""
@@ -30753,5 +30854,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -30762,5 +30863,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 "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
@@ -30768,10 +30869,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 ""
@@ -30780,5 +30881,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 ""
@@ -30786,10 +30887,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 "Sähkölinja"
@@ -30798,15 +30899,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 "Muokkaa sähkölinjan ominaisuuksia"
 
 #. 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"
@@ -30814,5 +30915,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"
@@ -30820,40 +30921,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 "Historialliset paikat"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Linna"
@@ -30862,20 +30963,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 "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -30884,10 +30985,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 "Muokkaa arkeologista kaivausta"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -30895,10 +30996,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 "Paleontologinen kaivaus"
@@ -30906,5 +31007,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 "Muokkaa paleontologista kaivausta"
@@ -30912,15 +31013,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "Monumentti"
 
 #. 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 "Muistomerkki"
@@ -30928,60 +31029,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 "Tienvarsiristi"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr "Muokkaa tienvarsiristiä"
 
 #. 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 "Kaupat"
 
 #. 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 "Lähikauppa"
@@ -30989,10 +31090,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 "Muokkaa lähikaupan tietoja"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Kioski"
@@ -31000,5 +31101,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 "Muokkaa kioskin ominaisuuksia"
@@ -31006,5 +31107,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Leipomo"
@@ -31012,10 +31113,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 "Muokkaa leipomon ominaisuuksia"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -31023,10 +31124,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 "Muokkaa lihakaupan ominaisuuksia"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr ""
@@ -31034,10 +31135,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 ""
@@ -31045,10 +31146,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 ""
@@ -31056,5 +31157,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 ""
@@ -31062,5 +31163,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr ""
@@ -31068,10 +31169,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 ""
@@ -31079,15 +31180,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 "Luomukauppa"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
@@ -31095,5 +31196,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr ""
@@ -31101,25 +31202,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 ""
@@ -31127,20 +31228,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 ""
@@ -31148,10 +31249,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 "Muokkaa urheiluvälinekauppaa"
@@ -31159,5 +31260,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -31165,10 +31266,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 "Muokkaa kuivapesulan ominaisuuksia"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Pesula"
@@ -31176,20 +31277,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 "Muokkaa pesulan ominaisuuksia"
 
 #. 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 ""
@@ -31197,35 +31298,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 ""
@@ -31233,10 +31334,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 ""
@@ -31244,35 +31345,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 ""
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. 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 "Raha"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Pankki"
@@ -31280,5 +31381,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 "Muokkaa pankin ominaisuuksia"
@@ -31286,10 +31387,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 "Pankkiautomaatti"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -31297,5 +31398,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 "Muokkaa rahanvaihdon ominaisuuksia"
@@ -31303,10 +31404,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 "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr ""
@@ -31314,10 +31415,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 ""
@@ -31325,5 +31426,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 ""
@@ -31331,35 +31432,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 "Kampaamo"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
 #. 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 "Muokkaa optikon ominaisuuksia"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr ""
@@ -31367,10 +31468,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 ""
@@ -31378,5 +31479,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 ""
@@ -31384,5 +31485,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr ""
@@ -31390,10 +31491,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 ""
@@ -31401,5 +31502,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 ""
@@ -31407,5 +31508,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -31413,10 +31514,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 "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr ""
@@ -31424,10 +31525,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 ""
@@ -31435,5 +31536,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 ""
@@ -31441,15 +31542,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 ""
@@ -31457,10 +31558,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 ""
@@ -31468,10 +31569,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 ""
@@ -31479,5 +31580,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 ""
@@ -31485,15 +31586,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 ""
@@ -31501,15 +31602,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 ""
@@ -31517,15 +31618,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Matkatoimisto"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "Muokkaa matkatoimistoa"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr ""
@@ -31533,20 +31634,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 ""
@@ -31554,10 +31655,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 "Automaatti"
@@ -31565,5 +31666,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 "Muokkaa automaatin tietoja"
@@ -31571,180 +31672,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 "Automaatin tuotteet"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "julkisen liikenteen lippuja"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "julkisen liikenteen aikatauluja"
 
 #. 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 "juomat"
 
 #. 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 ""
 
 #. 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 "Maantiede"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. 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 "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. 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 "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Paikat"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. 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"
@@ -31752,10 +31853,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31763,25 +31864,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Muokkaa seutua"
 
 #. 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 ""
@@ -31789,5 +31890,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
@@ -31796,10 +31897,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "Muokkaa suurkaupungin ominaisuuksia"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "Kaupunki"
@@ -31807,10 +31908,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 "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -31818,35 +31919,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 "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
 
 #. 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 ""
@@ -31854,5 +31955,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr ""
@@ -31860,10 +31961,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 "Huippu"
@@ -31871,10 +31972,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 "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -31882,10 +31983,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 "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -31893,10 +31994,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 "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -31904,5 +32005,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 "Muokkaa luolan suuaukon ominaisuuksia"
@@ -31910,5 +32011,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Saari"
@@ -31916,10 +32017,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 "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr ""
@@ -31927,15 +32028,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 "Puu"
@@ -31944,15 +32045,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 "Muokkaa puun ominaisuuksia"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "Metsä"
@@ -31961,10 +32062,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 "Muokkaa metsän ominaisuuksia"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -31972,5 +32073,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -31978,5 +32079,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -31984,5 +32085,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -31991,30 +32092,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 "Muokkaa talousmetsän ominaisuuksia"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "havumetsä"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "lehtimetsä"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "sekametsä"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -32022,15 +32123,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr "Tunturi"
@@ -32038,20 +32139,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 "Muokkaa tunturin ominaisuuksia"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "Nummi"
@@ -32059,15 +32160,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 "Muokkaa nummen ominaisuuksia"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -32076,40 +32177,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 "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. 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 "Niitty"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "Muokkaa niittyä"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -32117,15 +32218,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 "Siirtolapuutarha"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -32133,25 +32234,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Puutarha"
 
 #. 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 "Ruoho"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr ""
@@ -32159,10 +32260,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 ""
@@ -32170,20 +32271,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 "Puisto"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr ""
@@ -32191,5 +32292,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 ""
@@ -32197,15 +32298,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -32213,10 +32314,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 "Muokkaa pienen hautausmaan ominaisuuksia"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -32224,40 +32325,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 "Muokkaa hautausmaan ominaisuuksia"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr ""
@@ -32265,10 +32366,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 "Rata-alue"
@@ -32276,15 +32377,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 "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -32292,55 +32393,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr ""
@@ -32348,5 +32449,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
@@ -32357,5 +32458,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 "Muokkaa osoitetietoja"
@@ -32363,5 +32464,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Talon numero"
@@ -32369,5 +32470,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Talon nimi"
@@ -32376,55 +32477,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 "Kadunnimi"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "Kunta"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Maakoodi"
 
 #. 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 ""
@@ -32432,5 +32533,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
@@ -32442,5 +32543,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 "Muokkaa interpolointilinjan ominaisuuksia"
@@ -32448,35 +32549,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "Numerointitapa"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "pariton"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "parillinen"
 
 #. 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 "Kuva"
@@ -32486,5 +32587,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 "Muokkaa monimonikulmiota"
@@ -32496,5 +32597,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 ""
@@ -32502,5 +32603,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 ""
@@ -32508,5 +32609,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr ""
@@ -32517,5 +32618,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 ""
@@ -32523,46 +32624,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 ""
@@ -32571,5 +32677,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 ""
@@ -32577,40 +32683,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 "Kielto"
 
 #. 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 ""
@@ -32619,15 +32725,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 ""
@@ -32635,5 +32741,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr ""
@@ -32647,5 +32753,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 ""
@@ -32655,5 +32761,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 ""
@@ -32661,5 +32767,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
@@ -32669,5 +32775,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 ""
@@ -32675,5 +32781,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 ""
@@ -32681,5 +32787,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 "latu"
@@ -32732,9 +32838,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 ""
@@ -32742,5 +32848,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 ""
@@ -32748,5 +32854,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
@@ -32756,5 +32862,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 ""
@@ -32768,6 +32874,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
@@ -32777,5 +32883,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 ""
@@ -32787,6 +32893,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 ""
@@ -32794,5 +32900,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 ""
@@ -32800,5 +32906,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 ""
@@ -32806,5 +32912,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 ""
@@ -32812,5 +32918,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 ""
@@ -32818,5 +32924,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 ""
@@ -32824,5 +32930,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 ""
@@ -32834,15 +32940,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 ""
@@ -32850,5 +32956,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 ""
@@ -32856,5 +32962,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 ""
@@ -32862,5 +32968,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 ""
@@ -32868,5 +32974,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32880,25 +32986,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 ""
@@ -32906,5 +33012,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -32912,5 +33018,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 ""
@@ -32919,5 +33025,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr ""
@@ -32925,5 +33031,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr "Liittyvä katu"
@@ -32931,10 +33037,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 "Muokkaa liittyvä katu -relaatiota"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4402
+#: build/trans_presets.java:4404
 msgid "house"
 msgstr ""
@@ -33129,6 +33235,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 ""
@@ -33160,5 +33266,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 ""
@@ -33313,10 +33419,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 ""
@@ -33361,5 +33464,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr "moottoriliikennetie"
@@ -33403,7 +33506,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 ""
@@ -33477,5 +33580,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 ""
@@ -33487,5 +33590,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr ""
@@ -33503,5 +33606,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 ""
@@ -33512,5 +33615,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "kääntöympyrä"
@@ -33523,5 +33626,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 ""
@@ -33533,5 +33636,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 ""
@@ -33543,5 +33646,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr ""
@@ -33553,5 +33656,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr ""
@@ -33741,17 +33844,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 ""
@@ -33763,5 +33866,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr ""
@@ -33809,8 +33912,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 ""
 
@@ -33828,10 +33949,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 ""
@@ -33859,7 +33980,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 ""
@@ -33894,6 +34015,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 ""
@@ -33911,5 +34032,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 ""
@@ -33927,5 +34048,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 ""
@@ -33985,8 +34106,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 "köysirata"
@@ -34000,5 +34121,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 ""
@@ -34010,5 +34131,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 ""
@@ -34020,5 +34141,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 ""
@@ -34030,5 +34151,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 ""
@@ -34040,5 +34161,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 ""
@@ -34050,5 +34171,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 ""
@@ -34177,13 +34298,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 ""
@@ -34194,5 +34315,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 "laituri"
@@ -34204,5 +34325,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr ""
@@ -34318,13 +34439,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 ""
@@ -34336,5 +34457,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr ""
@@ -34408,10 +34529,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 ""
@@ -34495,11 +34616,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 ""
@@ -34835,24 +34956,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 ""
@@ -34878,6 +34999,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 ""
@@ -34924,8 +35045,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 ""
@@ -35294,34 +35415,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 "kauppa"
@@ -35377,8 +35498,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 "hotelli"
@@ -35454,9 +35575,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 "turismi"
@@ -35524,9 +35645,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 "historiallinen"
@@ -35593,9 +35714,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 ""
@@ -35606,5 +35727,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "louhos"
@@ -35616,5 +35737,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -35632,5 +35753,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 "valuma-alue"
@@ -35642,5 +35763,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "talousmetsä"
@@ -35652,5 +35773,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr ""
@@ -35662,5 +35783,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr ""
@@ -35679,5 +35800,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 "kaupallinen"
@@ -35689,5 +35810,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "teollisuus"
@@ -35699,5 +35820,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr ""
@@ -35709,5 +35830,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr ""
@@ -35719,5 +35840,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr "rata-alue"
@@ -35762,7 +35883,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 "armeija"
@@ -35774,5 +35895,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -35783,5 +35904,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "huippu"
@@ -35794,5 +35915,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 "jäätikkö"
@@ -35804,5 +35925,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 "tulivuori"
@@ -35844,8 +35965,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 ""
@@ -35857,5 +35978,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "pusikko"
@@ -35867,5 +35988,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "nummi"
@@ -35877,5 +35998,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr ""
@@ -35887,5 +36008,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "muta"
@@ -35897,5 +36018,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "ranta"
@@ -35955,8 +36076,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 "reitti"
@@ -36035,12 +36156,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 "raja"
@@ -36156,11 +36277,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 ""
@@ -36172,5 +36293,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
 msgstr ""
@@ -36206,6 +36327,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"
@@ -36446,9 +36567,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"
@@ -36456,44 +36576,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 "Open Aerial Map"
-
-#. <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 ""
@@ -36501,11 +36608,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 ""
@@ -36513,73 +36619,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"
-msgstr "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>
@@ -36587,29 +36720,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 ""
 
+#. <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>
@@ -36617,13 +36765,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>
@@ -36631,13 +36779,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>
@@ -36645,13 +36793,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>
@@ -36661,273 +36809,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-kartat"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr "Ordnance Survey 7th Series (50-60 -luvun kartat Briteistä)"
 
 #. <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 "NPE-kartat (Tim)"
-
-#. <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 "Ordnance Survey 7th Series (50-60 -luvun kartat Briteistä)"
-
-#. <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 "MLIT Japan (ORTHO01)"
-
-#. <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 "MLIT Japan (ORTHO02)"
-
-#. <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 "MLIT Japan (ORTHO03)"
-
-#. <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 "Lodi - Italy"
 
 #. <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 "Sicily - Italy"
 
 #. <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 "Fugro (Tanska)"
 
 #. <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>
@@ -36935,35 +37906,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 "Stevns (Tanska)"
 
 #. <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 ""
@@ -36975,9 +37962,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 ""
@@ -39386,4 +40374,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
@@ -39969,18 +40974,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 ""
@@ -40660,16 +41665,15 @@
 msgstr "Mittaukset"
 
-#: ../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 ""
@@ -40723,80 +41727,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
@@ -40804,35 +41842,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
@@ -40840,8 +41892,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
@@ -40851,11 +41911,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 ""
 
@@ -42251,4 +43342,12 @@
 msgstr "Palauta ennalleen muutoskokoelma #{0}"
 
+#: ../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"
@@ -42424,4 +43523,24 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "Kyllä, poista pisteet"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Poista pisteet ladatun alueen ulkopuolelta"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "Ei, peruuta"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "Haluatko poistaa ne silti?"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "Poista pisteitä ladatun alueen ulkopuolelta?"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42482,9 +43601,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 ""
 
@@ -43169,9 +44283,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 ""
@@ -43266,17 +44380,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 ""
@@ -43997,4 +45111,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
@@ -44016,27 +45146,12 @@
 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 "Avaa URL-osoite."
-
-#: ../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
-#, fuzzy
-msgid "Configure custom URL"
-msgstr "Valitse sivustot..."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
@@ -44095,8 +45210,38 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:51
 msgid "More tools"
 msgstr "Lisää työkaluja"
 
+#: ../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 ""
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:20
 msgid "Align Way Nodes"
@@ -44212,5 +45357,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 ""
@@ -44224,5 +45369,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 ""
@@ -44237,12 +45382,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 ""
 
@@ -44576,2 +45735,44 @@
 msgid "Drive a race car on this layer"
 msgstr ""
+
+#~ msgid "NPE Maps"
+#~ msgstr "NPE-kartat"
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "Open Aerial Map"
+
+#~ msgid "Overlapping areas"
+#~ msgstr "Päällekkäiset alueet"
+
+#~ msgid "Object history"
+#~ msgstr "Objektin historia"
+
+#~ msgid "MLIT Japan (ORTHO01)"
+#~ msgstr "MLIT Japan (ORTHO01)"
+
+#~ msgid "MLIT Japan (ORTHO02)"
+#~ msgstr "MLIT Japan (ORTHO02)"
+
+#~ msgid "MLIT Japan (ORTHO03)"
+#~ msgstr "MLIT Japan (ORTHO03)"
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "NPE-kartat (Tim)"
+
+#~ msgid "Cannot open {0} file because no suitable file importer is available."
+#~ msgid_plural ""
+#~ "Cannot open {0} files because no suitable file importer is available."
+#~ msgstr[0] "{0} tiedoston avaaminen ei onnistu, tiedostomuotoa ei tunneta."
+#~ msgstr[1] "{0} tiedoston avaaminen ei onnistu, tiedostomuotoa ei tunneta."
+
+#~ msgid "Info about Element"
+#~ msgstr "Tietoja kohteesta"
+
+#~ msgid "Get detailed information on the internal state of the objects."
+#~ msgstr "Hae tarkat tiedot kohteiden sisäisestä tilasta"
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr "Näytä tietoja OSM-solmuista, -poluista tai -relaatioista."
