Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 26723)
+++ /applications/editors/josm/i18n/po/is.po	(revision 26724)
@@ -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: 2010-11-27 04:37+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\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:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:42+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"
@@ -166,14 +149,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
@@ -184,7 +167,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
@@ -200,6 +183,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
@@ -209,5 +192,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
@@ -385,8 +368,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
@@ -400,6 +383,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
@@ -411,6 +394,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
@@ -425,6 +408,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
@@ -446,7 +429,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
@@ -463,5 +448,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 "Hætta við"
@@ -472,4 +457,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java:141
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr ""
@@ -529,4 +515,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
@@ -575,5 +562,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
@@ -591,4 +578,5 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18
+#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:145
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
@@ -609,5 +597,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:39
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37
@@ -625,4 +613,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:26
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:28
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:30
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:29
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:29
@@ -654,8 +643,8 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:625
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:665
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1000
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1030
@@ -684,5 +673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:75
 msgid "data"
 msgstr "gögnum"
@@ -751,5 +740,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:374
 msgid "Close open changesets"
 msgstr "Loka opnum breytingarsettum"
@@ -769,6 +758,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:47
 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:68
@@ -850,9 +839,10 @@
 msgstr "Veldu eithvað til að afrita"
 
-#: ../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 ""
@@ -907,13 +897,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
@@ -925,5 +915,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
@@ -943,14 +933,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 "Yfirskrifa"
 
 #: ../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 "Þessi skrá er þegar til. Yfirskrifa hana?"
@@ -1135,5 +1125,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}"
@@ -1207,12 +1197,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Breytingaskrá hluts"
-
-#: ../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 "Breytingaskrá"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Sýna breytingarskrá þessa hluts á OpenStreetMap vefnum"
+
+#: ../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
@@ -1257,5 +1261,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 "Í lagi"
@@ -1282,12 +1286,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 "Upplýsingar um hlut"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum"
+#: ../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
@@ -1307,6 +1323,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."
@@ -1316,21 +1335,24 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 msgid "This can lead to nodes being deleted accidentally."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:341
 msgid "Are you really sure to continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:695
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:839
 msgid "Please abort if you are not sure"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:362
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:384
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
+msgid "The selected area is incomplete. Continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:355
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:377
 msgid "No intersection found. Nothing was changed."
 msgstr ""
@@ -1338,33 +1360,33 @@
 #. revert changes
 #. FIXME: this is dirty hack
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:383
 msgid "Reverting changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:451
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:444
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:516
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:509
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:522
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:515
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1372,23 +1394,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1234
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1244
 msgid ""
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1249
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1263
 msgid ""
 "Sorry. Cannot handle way that is both inner and outer in multipolygon "
@@ -1396,19 +1418,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1268
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1261
 msgid ""
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363
 msgid "Removed Element from Relations"
 msgstr ""
 
 #. I18N: current action printed in status display
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1439
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1432
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr ""
@@ -1613,4 +1635,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
@@ -1630,8 +1653,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 ""
@@ -1651,4 +1675,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
@@ -1668,8 +1693,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 ""
@@ -1750,20 +1776,31 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156
 #, java-format
-msgid "Cannot open {0} file because no suitable file importer is available."
+msgid ""
+"Cannot open {0} file because file does not exist or no suitable file "
+"importer is available."
 msgid_plural ""
-"Cannot open {0} files because no suitable file importer is available."
+"Cannot open {0} files because files do not exist or no suitable file "
+"importer is available."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167
+msgid "no importer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167
+msgid "does not exist"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:213
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1772,5 +1809,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1890,7 +1927,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
@@ -2055,5 +2092,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 "Vista"
@@ -2069,30 +2106,30 @@
 msgstr "Skráin {0} er þegar til. Yfirskrifa hana?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "No Exporter found! Nothing saved."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Tómt skjal"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "The document contains no data."
 msgstr ""
 
 #. I18N: Display title of the window showing conflicts
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
 msgid "Conflicts"
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -2100,13 +2137,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "Vista OSM skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "Vista GPX skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr ""
@@ -2159,5 +2196,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
@@ -2167,55 +2204,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 "Loka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Einfalda veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Delete unnecessary nodes from a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:66
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
-msgid "Yes, delete nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
-msgid "Delete nodes outside of downloaded data regions"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:263
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
-msgid "No, abort"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:120
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
-msgid "Cancel operation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
-msgid "Do you want to delete them anyway?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
-msgid "Delete nodes outside of data regions?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:49
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:90
 msgid "Please select at least one way to simplify."
 msgstr "Veldu í það minnsta einn veg til að einfalda."
 
-#: ../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
@@ -2226,10 +2230,16 @@
 msgstr "Já"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:95
 msgid "Simplify all selected ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
+msgid "Cancel operation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2238,10 +2248,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:77
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 msgid "Simplify ways?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:196
 #, java-format
@@ -2251,5 +2261,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:189
 #, java-format
 msgid "Simplify Way (remove {0} node)"
@@ -2315,5 +2325,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 "
@@ -2322,5 +2332,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 "
@@ -2356,47 +2366,47 @@
 msgstr "Skipta upp hnút sem er notaður af mörgum vegum."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:86
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
 msgid "None of this way''s nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid "* One node that is used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -2406,14 +2416,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:377
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:400
 #, java-format
 msgid "Dupe {0} node into {1} nodes"
@@ -2421,4 +2431,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
@@ -2514,14 +2541,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
 msgid "Upload data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2530,5 +2557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:114
@@ -2536,5 +2563,5 @@
 msgstr "Engar breytingar til að hlaða upp"
 
-#: ../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 "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst."
@@ -3002,8 +3029,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
@@ -3370,5 +3397,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 "Leit"
@@ -3592,5 +3619,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 "Annað"
@@ -3737,25 +3764,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"
@@ -3764,5 +3791,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"
@@ -3771,5 +3798,5 @@
 msgstr[1] "Eyða {0} hnútum"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -3778,5 +3805,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"
@@ -3785,13 +3812,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."
@@ -3803,14 +3832,5 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../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 "
@@ -4024,4 +4044,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}''"
@@ -4029,19 +4050,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 ""
@@ -4050,5 +4072,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4057,5 +4079,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4064,5 +4086,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4071,5 +4093,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4077,5 +4099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4084,5 +4106,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4091,5 +4113,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4098,5 +4120,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4105,5 +4127,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}"
@@ -4177,20 +4199,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 "S"
 
-#: ../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 "N"
 
-#: ../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 "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4207,5 +4229,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}."
@@ -4213,5 +4235,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}."
@@ -4229,5 +4251,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 ""
@@ -4235,5 +4257,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 ""
@@ -4302,5 +4324,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 "
@@ -4308,5 +4330,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 ""
@@ -4317,5 +4339,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"
@@ -4338,6 +4360,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"
@@ -4680,5 +4702,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 ""
@@ -4705,4 +4727,9 @@
 #, java-format
 msgid "Running test {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:26
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:78
+msgid "Building inside building"
 msgstr ""
 
@@ -4757,71 +4784,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 ""
@@ -4884,54 +4938,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 "Marghyrningur"
 
-#: ../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 ""
@@ -4965,4 +5019,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."
@@ -4975,29 +5034,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 ""
@@ -5198,7 +5253,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
@@ -5219,7 +5274,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
@@ -5245,5 +5300,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."
@@ -5403,48 +5458,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 "gerð landnotkunar {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 "gerð frístunda {0}"
 
-#: ../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}"
@@ -5492,7 +5547,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"
@@ -5504,10 +5559,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 ""
@@ -5636,7 +5691,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}]"
@@ -5672,14 +5727,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:287
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:303
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
 msgid "incomplete"
 msgstr "óklárað"
 
 #. 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}"
@@ -5688,6 +5744,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}"
@@ -5695,12 +5751,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 ""
@@ -5708,17 +5764,17 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:601
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:602
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
-#: ../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 ""
@@ -5727,8 +5783,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
@@ -5739,6 +5795,6 @@
 msgstr[1] "{0} hnútar"
 
-#: ../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"
@@ -5747,9 +5803,9 @@
 msgstr[1] "{0} stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:494
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5855,5 +5911,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 ""
@@ -6083,5 +6139,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"
@@ -6089,10 +6145,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 "Sýn"
 
-#: ../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
@@ -6101,5 +6157,5 @@
 msgstr "Tól"
 
-#: ../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
@@ -6107,5 +6163,5 @@
 msgstr "Forstillingar"
 
-#: ../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
@@ -6116,5 +6172,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Hljóð"
@@ -6151,5 +6207,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"
@@ -6157,5 +6213,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"
@@ -6306,5 +6362,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
@@ -6487,5 +6543,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
@@ -6495,5 +6551,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"
@@ -6503,5 +6559,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 "Stök"
@@ -6725,5 +6781,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
@@ -6851,4 +6907,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 ""
@@ -6918,6 +6975,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
@@ -6939,6 +6996,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
@@ -7048,5 +7105,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"
@@ -7129,5 +7186,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
@@ -7139,5 +7196,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
@@ -7269,9 +7326,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:164
 msgid "For selected objects only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:165
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7280,18 +7337,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:243
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:245
 msgid "Open the list of changesets in the current layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:290
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:339
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
@@ -7299,23 +7356,23 @@
 msgstr "Niðurhala"
 
-#: ../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 "Skoða notandasíðu"
 
-#: ../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
@@ -7323,5 +7380,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 ""
@@ -7340,12 +7397,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
@@ -7392,5 +7449,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
@@ -7566,19 +7623,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 "Breytingaskrá"
-
-#: ../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 "Sýna breytingarsögu valdra hluta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:242
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:260
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
@@ -7588,10 +7639,10 @@
 msgstr "Endurhlaða"
 
-#: ../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 "Endurhlaða breytingaskrálistann með núverandi vali."
 
 #. 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
@@ -7603,149 +7654,140 @@
 msgstr "Sýna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Display the history of the selected objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66
 msgid "Advanced object info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77
 msgid "map style"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-msgid "In conflict with:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
-#, java-format
-msgid "Node id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
+#, java-format
+msgid " ({0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:144
+msgid "not in data set"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:191
-msgid " not in data set"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152
+msgid "Node: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:171
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
-msgid " incomplete\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157
-#, java-format
-msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:167
-#, java-format
-msgid "Way id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
-#, java-format
-msgid " {0} node; "
-msgid_plural " {0} nodes; "
+msgid "Relation: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:193
+msgid "deleted-on-server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:196
+msgid "modified"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199
+msgid "filtered/hidden"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:202
+msgid "filtered/disabled"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:206
+msgid "has direction keys (reversed)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:208
+msgid "has direction keys"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:213
+msgid "State: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:218
+msgid "Data Set: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:219
+msgid "Edited at: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:313
+msgid "<new object>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
+msgid "Edited by: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:223
+msgid "Version: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224
+msgid "In changeset: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:229
+msgid "Tags: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:250
+#, java-format
+msgid "{0} Member: "
+msgid_plural "{0} Members: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182
-msgid "  nodes:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
-#, java-format
-msgid "Relation id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199
-#, java-format
-msgid " {0} member; "
-msgid_plural " {0} members; "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:204
-msgid "  members:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:313
-msgid "<new object>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:212
-#, java-format
-msgid ""
-"Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: {4}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
-msgid "; deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224
-msgid "; deleted-on-server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227
-msgid "; modified"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230
-msgid "; filtered/hidden"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233
-msgid "; filtered/disabled"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:236
-msgid "; has direction keys"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:238
-msgid " (reversed)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:246
-msgid "  tags:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:258
-msgid "  way referrer:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:269
-msgid "  relation referrer:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:295
-#, java-format
-msgid "id: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:297
-#, java-format
-msgid " name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300
-#, java-format
-msgid " {0} name: {1}"
-msgid_plural " {0} names: {1}"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:254
+#, java-format
+msgid " as \"{0}\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:260
+#, java-format
+msgid "{0} Nodes: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:270
+msgid "Bounding box: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:275
+msgid "Coordinates: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:278
+msgid "Coordinates (projected): "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:286
+msgid "Part of: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:298
+msgid "In conflict with: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:325
 #, java-format
 msgid "Styles Cache for \"{0}\":"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
 #, java-format
 msgid ""
@@ -7755,5 +7797,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 ""
@@ -7762,5 +7804,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 ""
@@ -7770,5 +7812,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -7777,22 +7819,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 ""
@@ -7810,5 +7852,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
@@ -7820,10 +7862,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
@@ -7900,5 +7942,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 "Sýna/Fela"
@@ -7917,5 +7959,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 ""
@@ -7949,9 +7991,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 "Færa valið lag upp í röðinni"
 
-#: ../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 "Færa valið lag niður í röðinni"
@@ -8024,5 +8066,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"
@@ -8065,24 +8107,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 "Vensl"
 
-#: ../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 "Sýna lista yfir vensl"
 
-#: ../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 "Opna ritil til að breyta völdum venslum"
 
-#: ../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 "Eyða völdum venslum"
 
-#: ../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
@@ -8091,5 +8133,5 @@
 msgstr "Skapa ný vensl"
 
-#: ../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
@@ -8097,133 +8139,125 @@
 msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið"
 
-#: ../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 "Vensl: {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 "Núverandi val"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "Opna vallistann."
-
-#: ../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 "Þysja að vali"
-
-#: ../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 "Þysja að völdum hlut(um)"
-
-#: ../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 "Val"
 
-#: ../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 "Opna vallistann."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+msgid "Current Selection"
+msgstr "Núverandi val"
+
+#: ../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 "Þysja að vali"
+
+#: ../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 "Þysja að völdum hlut(um)"
+
+#: ../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 "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}"
 
-#: ../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 "Val: {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
@@ -8308,6 +8342,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 ""
 
@@ -8315,4 +8348,8 @@
 msgid "Open the validation window."
 msgstr "Opna athugunarglugga."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
+msgid "Validation results"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -8659,4 +8696,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" />
@@ -8712,8 +8754,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" />
@@ -9498,5 +9536,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
@@ -9507,179 +9545,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
@@ -10098,9 +10137,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 "Bæti vað eigindum"
 
-#: ../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."
@@ -10109,14 +10148,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:636
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:710
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:646
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:720
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:164
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:309
@@ -10128,5 +10167,5 @@
 msgstr "<mismunandi>"
 
-#: ../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?"
@@ -10134,13 +10173,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 ""
@@ -10149,5 +10188,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
@@ -10157,5 +10196,5 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../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."
@@ -10164,31 +10203,31 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../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 "Veldu lykil"
 
-#: ../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 "Veldu gildi"
 
-#: ../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 "Veldu hluti til að breyta eigindum þeirra."
 
-#: ../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 "Eigindi"
 
-#: ../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 "Eigindi valdra hluta."
 
 #. 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"
@@ -10197,63 +10236,87 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2746
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661
+#: build/trans_presets.java:2747
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:965
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../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 "Eigindi & vensl"
 
-#: ../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 "Breyta venslum"
 
-#: ../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 "Fjarlægja úr venslum"
 
-#: ../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 "Eyða valinu úr venslunum {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 "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../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 "Eyða eigindum"
 
-#: ../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 "Bæta nýjum eigindum við valda hluti"
 
-#: ../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 "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../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 ""
 
@@ -10739,57 +10802,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 "Búa til bókamerki"
 
-#: ../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 "Minnsta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lon"
 msgstr "Minnsta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "max lat"
 msgstr "Mesta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lon"
 msgstr "Mesta lengdargráða"
 
-#: ../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 "
@@ -10799,10 +10862,10 @@
 "svæðinu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "Afmarkað svæði"
 
-#: ../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
@@ -10811,15 +10874,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"
@@ -10895,13 +10958,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 ""
 
@@ -10950,7 +11004,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"
@@ -10966,12 +11025,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
@@ -11054,4 +11114,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"
@@ -11089,5 +11151,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 ""
@@ -11112,10 +11174,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 ""
@@ -11123,5 +11185,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 ""
@@ -11129,9 +11191,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 ""
@@ -11213,13 +11275,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 "Opna vafra með upplýsingum um þetta breytingarsett"
 
-#: ../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}"
@@ -11785,5 +11847,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
@@ -11795,11 +11857,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 "Lag"
@@ -11819,5 +11881,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 ""
@@ -11840,5 +11902,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
@@ -11851,5 +11913,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 "Tögg fyrir nýtt breytingarsett"
@@ -11868,30 +11930,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 "Hlaða upp breytingum"
 
-#: ../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 "Hlaða upp þessari breytingu"
 
-#: ../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 "
@@ -11902,33 +11964,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 "Hætta við að hala upp og halda áfrám að breyta"
 
-#: ../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}"
@@ -12284,5 +12346,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
@@ -12641,5 +12703,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 ""
@@ -12649,65 +12711,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 ""
@@ -12722,103 +12784,77 @@
 msgstr "Engar villur fundust við athugun"
 
-#: ../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 "Niðurhala sýnilega reiti"
 
-#: ../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 "Breyta upplausn"
 
-#: ../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 "Hlaða reiti sem innihalda villur"
 
-#: ../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 "Vista WMS lag í skrá"
 
-#: ../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 "Hlaða WMS lag úr skrá"
 
-#: ../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 ""
 
-#: ../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 "Sjálfvirkt niðurhal"
 
-#: ../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}"
@@ -13184,5 +13220,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"
@@ -13377,4 +13416,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 ""
@@ -13520,4 +13560,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"
@@ -13595,8 +13637,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 ""
 
@@ -13948,26 +13986,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722
 msgid "Menu Name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:88
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:89
 msgid "Unnamed Imagery Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:95
 msgid "WMS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:101
 msgid "Service URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:106
 msgid "Get Layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:144
 msgid ""
 "That layer does not support any of JOSM''s projections,\n"
@@ -13975,49 +14013,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 ""
@@ -14225,5 +14262,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}"
@@ -14359,5 +14396,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
@@ -14425,5 +14462,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 "Bíll"
@@ -14449,14 +14486,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 "Hjól"
@@ -14495,13 +14532,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 "Fótgangandi"
@@ -14650,113 +14687,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 "Niðurhalsforrit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180
 msgid "Overlap tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181
 msgid "% of east:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
 msgid "% of north:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197
 msgid "Simultaneous connections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:213
 msgid "Auto zoom by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:217
 msgid "Autoload tiles by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:221
 msgid "Min. zoom level: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:225
 msgid "Max. zoom level: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:229
 msgid "Add to slippymap chooser: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:233
 msgid "Tile cache directory: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255
 msgid "Common Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256
 msgid "WMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257
 msgid "TMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Imagery Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Modify list of imagery layers displayed in the Imagery menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274
 msgid "Imagery providers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276
 msgid "Offset bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:406
+msgid "Imagery Background: Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470
 msgid "Available default entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:428
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:504
 msgid "Selected entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
@@ -14767,55 +14808,55 @@
 msgstr "Ný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:447
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:599
 msgid "Add a new WMS/TMS entry by entering the URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:455
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:607
 msgid "Add Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:619
 msgid "Remove entry"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:493
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:645
 msgid "copy selected defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:664
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:549
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:707
 msgid "reload defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785
 msgid "Menu Name (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785
 msgid "Imagery URL (Default)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:686
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:830
 #, java-format
 msgid "EULA license URL not available: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:700
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:844
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Easting"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Northing"
 msgstr ""
@@ -15394,7 +15435,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 "Endurstilla"
@@ -15942,5 +15985,5 @@
 msgstr "Bæta við nýju taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479
 #, java-format
 msgid ""
@@ -15949,5 +15992,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 ""
@@ -15987,28 +16030,28 @@
 msgstr "Valfrjáls eigind:"
 
-#: ../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 "Nota forstillinguna „{0}“ í flokknum „{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 "Nota forstillinguna „{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 ""
 
-#: ../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
@@ -16018,15 +16061,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
@@ -16036,22 +16079,22 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../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 "Vista forstillingu"
 
-#: ../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"
@@ -16113,4 +16156,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 ""
 
@@ -16694,5 +16772,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
@@ -16808,5 +16886,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
@@ -16817,5 +16894,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
@@ -16843,4 +16920,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
@@ -16886,14 +16964,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
@@ -16903,10 +16981,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
@@ -16915,5 +16994,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
@@ -16923,16 +17002,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
@@ -16940,5 +17014,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
@@ -16946,5 +17020,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
@@ -16953,5 +17027,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
@@ -16961,21 +17035,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
@@ -16984,5 +17052,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
@@ -16990,6 +17058,6 @@
 msgstr "Ógildur hlutur með kenni=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
@@ -17002,8 +17070,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
@@ -17017,5 +17085,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
@@ -17023,5 +17091,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
@@ -17030,6 +17098,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
@@ -17043,6 +17111,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
@@ -17053,5 +17121,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
@@ -17060,5 +17128,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
@@ -17067,52 +17135,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 "Undirbý OSM gögn..."
 
-#: ../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 "Undirbý gögn..."
 
-#: ../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
@@ -17269,4 +17304,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 "Sýna hnit sem"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "Loka breytingarsetti {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 "Hala niður OSM gögnum..."
+
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
@@ -17286,11 +17349,4 @@
 msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
 
-#: ../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
@@ -17306,29 +17362,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 ""
 
@@ -18068,10 +18099,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
@@ -18081,5 +18112,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
@@ -18088,6 +18119,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 ""
@@ -18122,5 +18153,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18133,5 +18164,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"
@@ -18141,5 +18172,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18150,5 +18181,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 "(Ráð: Þú getur breytt flýtileiðum í valkostum)"
@@ -18779,16 +18810,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 "
@@ -18798,15 +18834,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 "
@@ -18816,5 +18852,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -18823,10 +18859,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 "
@@ -18835,10 +18871,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 "
@@ -18847,5 +18883,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."
@@ -18853,5 +18889,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 "
@@ -18861,5 +18897,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 "
@@ -18869,25 +18905,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. "
@@ -18896,5 +18932,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 "
@@ -18904,15 +18940,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"
@@ -18920,5 +18956,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."
@@ -18926,10 +18962,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 "
@@ -18938,5 +18974,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 "
@@ -18945,15 +18981,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."
@@ -18961,25 +18997,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 "
@@ -18989,5 +19025,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 "
@@ -18996,10 +19032,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 "
@@ -19009,20 +19045,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 "
@@ -19032,15 +19068,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). "
@@ -19049,5 +19085,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) "
@@ -19056,10 +19092,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."
@@ -19067,5 +19103,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19074,15 +19110,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 "
@@ -19092,5 +19128,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19099,20 +19135,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 "
@@ -19277,9 +19313,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 "Tilvísun"
@@ -19332,6 +19368,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 "Hámarkshraði (km/klst)"
@@ -19380,9 +19416,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 "Einstefnuvegur"
@@ -19432,9 +19468,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 "Brú"
@@ -19475,9 +19511,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 "Göng"
@@ -19516,9 +19552,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 "Niðurgrafinn"
@@ -19557,9 +19593,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 "Upphækkun"
@@ -19598,9 +19634,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 ""
@@ -19686,4 +19722,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"
@@ -19701,8 +19738,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 ""
@@ -19722,4 +19760,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
@@ -19737,8 +19776,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 ""
@@ -19758,4 +19798,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
@@ -19773,8 +19814,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 ""
@@ -19794,4 +19836,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
@@ -19809,8 +19852,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 ""
@@ -19830,4 +19874,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
@@ -19845,8 +19890,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 ""
@@ -19919,5 +19965,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 ""
@@ -19949,10 +19995,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 "Breidd (í metrum)"
@@ -19994,9 +20040,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 "Slitlag"
@@ -20021,9 +20067,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 "malbikaður"
@@ -20047,9 +20093,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 "ómalbikaður"
@@ -20073,9 +20119,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 ""
@@ -20100,9 +20146,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 ""
@@ -20127,9 +20173,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 ""
@@ -20149,4 +20195,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
@@ -20155,10 +20202,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 "skógur"
@@ -20182,9 +20229,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 ""
@@ -20209,9 +20256,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 "götusteinn"
@@ -20236,9 +20283,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 ""
@@ -20262,9 +20309,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 ""
@@ -20288,9 +20335,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 ""
@@ -20314,9 +20361,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 ""
@@ -20341,9 +20388,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 ""
@@ -20368,9 +20415,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 ""
@@ -20396,10 +20443,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 ""
@@ -20550,5 +20597,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 "hringtorg"
@@ -20702,64 +20749,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
@@ -20835,8 +20882,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"
@@ -20866,8 +20913,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 ""
@@ -20917,9 +20964,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"
@@ -20962,9 +21009,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"
@@ -20985,7 +21032,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 "í landbúnaðarskyni"
@@ -21005,7 +21052,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 ""
@@ -21145,61 +21192,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
@@ -21233,10 +21280,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 ""
@@ -21268,10 +21315,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 ""
@@ -21290,11 +21337,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 "Hestar"
@@ -21312,5 +21359,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 ""
@@ -21331,12 +21378,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 "Vélhjól"
@@ -21354,10 +21401,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 "Bifreið"
@@ -21457,6 +21504,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 "hraðbraut"
@@ -21464,5 +21511,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 "tengibraut á hraðbraut"
@@ -21482,6 +21529,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 "stofnvegur"
@@ -21489,5 +21536,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 ""
@@ -21507,6 +21554,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 ""
@@ -21514,5 +21561,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 ""
@@ -21532,6 +21579,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 ""
@@ -21551,6 +21598,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 ""
@@ -21558,5 +21605,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 "óflokkaður"
@@ -21570,6 +21617,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 "íbúðargata"
@@ -21577,5 +21624,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 "vistgata"
@@ -21616,6 +21663,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 "þjónustuvegur"
@@ -21623,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 "bus_guideway"
 msgstr ""
@@ -21646,7 +21693,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 "byggingarsvæði"
@@ -21682,11 +21729,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "Vað"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "Breyti vaði"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "Vegir"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr ""
@@ -21695,35 +21753,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:531
+#: build/trans_presets.java:541
 msgid "Edit Track"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade1"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade2"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade3"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade4"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade5"
 msgstr ""
@@ -21731,10 +21789,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 ""
@@ -21742,5 +21800,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr ""
@@ -21749,50 +21807,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, "
@@ -21801,5 +21859,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 "
@@ -21809,5 +21867,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 "
@@ -21816,5 +21874,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, "
@@ -21823,5 +21881,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, "
@@ -21831,5 +21889,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"
@@ -21837,10 +21895,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 ""
@@ -21848,15 +21906,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 ""
@@ -21879,23 +21937,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1956
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007 build/trans_presets.java:2025
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2081 build/trans_presets.java:2104
-#: build/trans_presets.java:2123 build/trans_presets.java:2140
-#: build/trans_presets.java:2159 build/trans_presets.java:2178
-#: build/trans_presets.java:2194 build/trans_presets.java:2211
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:591 build/trans_presets.java:1957
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2060
+#: build/trans_presets.java:2082 build/trans_presets.java:2105
+#: build/trans_presets.java:2124 build/trans_presets.java:2141
+#: build/trans_presets.java:2160 build/trans_presets.java:2179
+#: build/trans_presets.java:2195 build/trans_presets.java:2212
+#: build/trans_presets.java:2227
 msgid "Wheelchairs"
 msgstr ""
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:582
+#: build/trans_presets.java:592
 msgid "Ski"
 msgstr ""
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr ""
@@ -21904,5 +21962,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21910,5 +21968,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 "Breyti reiðstíg"
@@ -21916,5 +21974,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -21922,10 +21980,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 ""
@@ -21934,6 +21992,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 ""
@@ -21984,27 +22042,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 ""
@@ -22013,6 +22071,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 ""
@@ -22021,6 +22079,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 ""
@@ -22029,6 +22087,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 ""
@@ -22037,6 +22095,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 ""
@@ -22045,21 +22103,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 ""
@@ -22067,15 +22125,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 ""
@@ -22093,11 +22151,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 "Breyti hjólastíg"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr ""
@@ -22105,5 +22163,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -22111,5 +22169,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -22117,5 +22175,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr ""
@@ -22124,5 +22182,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 "Breyti göngustíg"
@@ -22130,5 +22188,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "Stigi"
@@ -22138,10 +22196,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 "Breyti stiga"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr ""
@@ -22149,5 +22207,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"
@@ -22155,5 +22213,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr ""
@@ -22161,10 +22219,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:740
+#: build/trans_presets.java:750
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:744
+#: build/trans_presets.java:754
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22173,10 +22231,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 "Vegþjónustur"
@@ -22184,5 +22242,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 "Breyti vegþjónustu"
@@ -22276,42 +22334,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 "Rekstraraðili"
@@ -22320,6 +22378,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 "Salerni"
@@ -22327,5 +22385,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -22333,5 +22391,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 ""
@@ -22339,5 +22397,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "Neyðarsími"
@@ -22347,5 +22405,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -22355,5 +22413,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 ""
@@ -22362,6 +22420,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 ""
@@ -22370,6 +22428,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 ""
@@ -22378,6 +22436,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 "eyja"
@@ -22386,6 +22444,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 ""
@@ -22394,6 +22452,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 ""
@@ -22402,6 +22460,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 ""
@@ -22410,11 +22468,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 ""
@@ -22422,5 +22480,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 ""
@@ -22428,5 +22486,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 ""
@@ -22434,5 +22492,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 ""
@@ -22440,5 +22498,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 ""
@@ -22446,5 +22504,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 ""
@@ -22452,5 +22510,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 ""
@@ -22458,5 +22516,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr ""
@@ -22464,5 +22522,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -22473,15 +22531,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 "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "clockwise"
 msgstr "réttsælis"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:804
 msgid "Pedestrian Crossing"
 msgstr "Gangbraut"
@@ -22490,15 +22548,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:797
+#: build/trans_presets.java:807
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr ""
@@ -22506,40 +22564,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:817
 msgid "Edit Traffic Calming"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "bump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "chicane"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "hump"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:820
 msgid "Passing Place"
 msgstr ""
@@ -22547,5 +22605,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 ""
@@ -22553,5 +22611,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 "Beygjuhringur"
@@ -22561,5 +22619,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 "Borgarmörk"
@@ -22567,15 +22625,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 "Breyti borgarmarkaskilti"
 
 #. 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 "Hraðamyndavél"
@@ -22585,5 +22643,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr ""
@@ -22592,17 +22650,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "Vað"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "Breyti vaði"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -22610,5 +22657,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 "Breyti skarði"
@@ -22620,7 +22667,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 "Hæð (y/s)"
@@ -22655,18 +22702,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 ""
@@ -22674,5 +22721,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Tálmar"
@@ -22680,5 +22727,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr ""
@@ -22686,5 +22733,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 ""
@@ -22734,27 +22781,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 "Leyfileg umferð:"
 
 #. 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 "Rimlahlið"
@@ -22762,10 +22809,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 "Breyti rimlahliði"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr ""
@@ -22773,15 +22820,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 "Tollskýli"
@@ -22789,5 +22836,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 "Breyti tollskýli"
@@ -22795,10 +22842,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -22807,5 +22854,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "Limgerði"
@@ -22814,24 +22861,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr ""
 
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#. item "Barriers/Wire Fence"
-#: build/trans_presets.java:953
-msgid "Wire Fence"
-msgstr ""
-
-#. <key key="barrier" value="wire_fence" />
-#. item "Barriers/Wood Fence"
-#: build/trans_presets.java:956
-msgid "Wood Fence"
-msgstr ""
-
-#. <key key="barrier" value="wood_fence" />
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "barbed_wire"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "chain"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#. item "Leisure/Public Grill" combo "Fuel" display value
+#: build/trans_presets.java:955 build/trans_presets.java:2398
+msgid "electric"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "hedge"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:955 build/trans_presets.java:2677
+msgid "pole"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "split_rail"
+msgstr ""
+
+#. </optional>
 #. item "Barriers/Wall"
-#: build/trans_presets.java:959
+#: build/trans_presets.java:958
 msgid "Wall"
 msgstr ""
@@ -22839,5 +22905,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -22846,5 +22912,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 ""
@@ -22855,15 +22921,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:972
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:973
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr "Hlið"
@@ -22871,50 +22937,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 "Breyti hliði"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. 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 ""
@@ -22922,25 +22988,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1045
+#: build/trans_presets.java:1044
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
+#: build/trans_presets.java:1052
+msgid "Turnstile"
+msgstr ""
+
+#. item "Barriers/Turnstile" label "Edit Turnstile"
 #: build/trans_presets.java:1053
-msgid "Turnstile"
-msgstr ""
-
-#. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Sally Port"
+#: build/trans_presets.java:1061
+msgid "Sally Port"
+msgstr ""
+
+#. item "Barriers/Sally Port" label "Edit Sally Port"
 #: build/trans_presets.java:1062
-msgid "Sally Port"
-msgstr ""
-
-#. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
 msgstr ""
@@ -22950,6 +23016,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 "Vatn"
@@ -22957,5 +23023,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "Frárennsli"
@@ -22963,10 +23029,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 "Breyti frárennsli"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr ""
@@ -22974,10 +23040,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 "Lækur"
@@ -22985,10 +23051,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 "Breyti læk"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -22996,10 +23062,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 "Breyti skipaskurð"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "Á"
@@ -23009,5 +23075,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 "Breyti á"
@@ -23015,5 +23081,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Goshver"
@@ -23021,20 +23087,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 "Breyti goshver"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr ""
@@ -23042,10 +23108,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1139
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Stífla"
@@ -23053,10 +23119,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 "Breyti stíflu"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
 msgstr ""
@@ -23064,5 +23130,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 ""
@@ -23072,15 +23138,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 ""
@@ -23088,15 +23154,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1167
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java: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 ""
@@ -23104,20 +23170,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 "Breyti vatni"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "Breyti landi"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -23125,10 +23191,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 "Breyti strandlengju"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -23137,5 +23203,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 "Breyti árbakka"
@@ -23143,5 +23209,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "Votlendi"
@@ -23152,15 +23218,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 "Breyti votlendi"
 
 #. 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 ""
@@ -23173,40 +23239,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1212 build/trans_style.java:2930
+#: build/trans_presets.java:1211 build/trans_style.java:2945
 msgid "marsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "Leðja"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Strönd"
@@ -23214,20 +23280,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 "Breyti strönd"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Flói"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "Klettur"
@@ -23235,15 +23301,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 "Breyti klett"
 
 #. 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 ""
@@ -23251,20 +23317,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1239
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "Cargo"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "vehicle"
 msgstr ""
@@ -23350,26 +23416,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 "hjól"
 
 #. 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 "Siglingarleið ferju"
@@ -23377,5 +23443,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 ""
@@ -23384,15 +23450,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "Bryggja"
@@ -23400,10 +23466,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 "Breyti bryggju"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr ""
@@ -23412,5 +23478,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 ""
@@ -23420,5 +23486,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr ""
@@ -23428,10 +23494,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 ""
@@ -23439,10 +23505,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 "Skipakví"
@@ -23450,20 +23516,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 "Breyti skipakví"
 
 #. group "Transport"
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1298
 msgid "Transport"
 msgstr "Samgöngur"
 
 #. group "Transport/Railway"
+#: build/trans_presets.java:1299
+msgid "Railway"
+msgstr ""
+
+#. item "Transport/Railway/Rail"
 #: build/trans_presets.java:1300
-msgid "Railway"
-msgstr ""
-
-#. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
 msgid "Rail"
 msgstr ""
@@ -23471,5 +23537,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 ""
@@ -23499,7 +23565,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 ""
@@ -23515,8 +23581,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 ""
@@ -23530,8 +23596,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 ""
@@ -23545,8 +23611,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 ""
@@ -23560,8 +23626,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 ""
@@ -23574,8 +23640,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 ""
@@ -23588,8 +23654,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 ""
@@ -23618,4 +23684,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
@@ -23650,12 +23723,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
@@ -23673,9 +23747,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 "Volt"
@@ -23688,8 +23762,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 ""
@@ -23702,8 +23776,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 ""
@@ -23711,10 +23785,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 ""
@@ -23722,5 +23796,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr ""
@@ -23728,5 +23802,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 ""
@@ -23734,10 +23808,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 ""
@@ -23745,10 +23819,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 ""
@@ -23756,10 +23830,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1361
+msgid "Subway"
+msgstr ""
+
+#. item "Transport/Railway/Subway" label "Edit Subway"
 #: build/trans_presets.java:1362
-msgid "Subway"
-msgstr ""
-
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
 msgid "Edit Subway"
 msgstr ""
@@ -23767,10 +23841,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 ""
@@ -23778,5 +23852,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr ""
@@ -23784,5 +23858,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 ""
@@ -23791,10 +23865,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 ""
@@ -23803,10 +23877,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 ""
@@ -23815,5 +23889,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr ""
@@ -23822,5 +23896,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr ""
@@ -23830,5 +23904,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr ""
@@ -23836,5 +23910,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr ""
@@ -23843,5 +23917,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 ""
@@ -23850,10 +23924,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -23861,5 +23935,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 "Breyti stólalyftu"
@@ -23881,12 +23955,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 "Tilvísun"
@@ -23912,14 +23986,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 ""
@@ -23937,10 +24011,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 ""
@@ -23948,5 +24022,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 ""
@@ -23956,6 +24030,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 ""
@@ -23963,5 +24037,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -23969,5 +24043,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 "Breyti toglyftu"
@@ -23975,5 +24049,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "Kláfur"
@@ -23981,10 +24055,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 "Breyti kláf"
 
 #. 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 ""
@@ -23992,5 +24066,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr ""
@@ -23998,10 +24072,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 ""
@@ -24009,5 +24083,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24015,10 +24089,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 ""
@@ -24026,5 +24100,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24032,5 +24106,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 ""
@@ -24038,5 +24112,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24044,5 +24118,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 ""
@@ -24050,5 +24124,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24056,5 +24130,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 ""
@@ -24062,5 +24136,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24068,5 +24142,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 ""
@@ -24074,5 +24148,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24080,5 +24154,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 ""
@@ -24086,5 +24160,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24092,5 +24166,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24100,5 +24174,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24107,5 +24181,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"
@@ -24113,5 +24187,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24120,5 +24194,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"
@@ -24136,6 +24210,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 "Stæði"
@@ -24144,5 +24218,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 "Breyti stæði"
@@ -24150,5 +24224,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 ""
@@ -24156,5 +24230,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 "slitlag"
@@ -24162,10 +24236,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1592 build/trans_presets.java:1705
+#: build/trans_presets.java:1591 build/trans_presets.java:1704
 msgid "underground"
 msgstr ""
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr ""
@@ -24176,7 +24250,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 ""
@@ -24184,25 +24258,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 ""
@@ -24210,5 +24284,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -24218,5 +24292,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 "Breyti bensínstöð"
@@ -24229,117 +24303,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 ""
@@ -24432,48 +24506,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 "Opnunartími"
@@ -24564,47 +24638,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 ""
@@ -24696,47 +24770,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 ""
@@ -24806,126 +24880,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 ""
@@ -24933,5 +25007,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -24939,20 +25013,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 "Bílaþvottastöð"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
@@ -24960,5 +25034,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr ""
@@ -24966,5 +25040,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 "Breyti bílabúð"
@@ -24972,20 +25046,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1656 build/trans_presets.java:1719
+#: build/trans_presets.java:1655 build/trans_presets.java:1718
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr ""
 
 #. item "Car/Tyres"
+#: build/trans_presets.java:1663
+msgid "Tyres"
+msgstr ""
+
+#. item "Car/Tyres" label "Edit Tyres"
 #: build/trans_presets.java:1664
-msgid "Tyres"
-msgstr ""
-
-#. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1665
 msgid "Edit Tyres"
 msgstr ""
@@ -24993,5 +25067,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 ""
@@ -25035,15 +25109,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 ""
@@ -25068,14 +25142,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 ""
@@ -25103,15 +25177,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 ""
@@ -25136,14 +25210,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 ""
@@ -25153,6 +25227,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 "Leiga"
@@ -25161,10 +25235,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 "Breyti bílaleigu"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr ""
@@ -25172,5 +25246,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 ""
@@ -25179,16 +25253,16 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1693 build/trans_presets.java:1704
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1692 build/trans_presets.java:1703
+#: build/trans_presets.java:1736
 msgid "Capacity"
 msgstr ""
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1700
 msgid "Edit Motorcycle Parking"
 msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
 msgstr ""
@@ -25196,25 +25270,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"
@@ -25222,5 +25296,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25228,5 +25302,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25234,5 +25308,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25243,6 +25317,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 ""
@@ -25250,35 +25324,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 ""
@@ -25288,6 +25362,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 "Föt"
@@ -25295,10 +25369,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 "Breyti hjólastæði"
 
+#. 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 ""
@@ -25307,40 +25427,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 "Breyti hjólabúð"
 
 #. 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 ""
@@ -25349,10 +25469,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 "Breyti hjólaleigu"
 
 #. 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"
@@ -25360,5 +25480,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -25368,5 +25488,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"
@@ -25374,5 +25494,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -25380,5 +25500,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr ""
@@ -25386,5 +25506,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 ""
@@ -25392,5 +25512,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr ""
@@ -25399,5 +25519,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 ""
@@ -25405,5 +25525,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr ""
@@ -25412,5 +25532,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 ""
@@ -25422,5 +25542,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 ""
@@ -25429,11 +25549,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 ""
@@ -25442,5 +25562,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 ""
@@ -25448,5 +25568,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 ""
@@ -25455,5 +25575,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -25462,5 +25582,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 "Breyti strætóstöð"
@@ -25468,5 +25588,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -25476,5 +25596,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 "Breyti strætóstoppi"
@@ -25483,6 +25603,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
@@ -25494,10 +25614,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 "Bekkur"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
 msgstr ""
@@ -25505,10 +25625,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 ""
@@ -25516,10 +25636,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 ""
@@ -25528,6 +25648,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 "Mynt"
@@ -25536,6 +25656,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 "Athugasemd"
@@ -25544,6 +25664,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 ""
@@ -25552,6 +25672,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 "Debetkort"
@@ -25560,6 +25680,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 "Kreditkort"
@@ -25567,10 +25687,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 "Leigubílastöð"
@@ -25578,5 +25698,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 "Breyti leigubílastöð"
@@ -25584,10 +25704,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "Flugvöllur"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
 msgstr ""
@@ -25595,5 +25715,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 ""
@@ -25601,10 +25721,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 ""
@@ -25613,5 +25733,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr ""
@@ -25619,5 +25739,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 ""
@@ -25625,5 +25745,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr ""
@@ -25631,5 +25751,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 ""
@@ -25637,5 +25757,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr ""
@@ -25643,5 +25763,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 ""
@@ -25651,5 +25771,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 ""
@@ -25659,5 +25779,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 ""
@@ -25668,6 +25788,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 ""
@@ -25677,5 +25797,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 ""
@@ -25684,5 +25804,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr ""
@@ -25690,10 +25810,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"
@@ -25702,15 +25822,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 ""
@@ -25722,5 +25842,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 "Hótel"
@@ -25729,5 +25849,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 "Breyti hóteli"
@@ -25741,8 +25861,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 "Stjörnur"
@@ -25778,12 +25898,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 ""
@@ -25804,12 +25924,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 ""
@@ -25830,12 +25950,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 ""
@@ -25862,12 +25982,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 ""
@@ -25888,12 +26008,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 ""
@@ -25916,12 +26036,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 ""
@@ -25943,12 +26063,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 ""
@@ -25970,12 +26090,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 ""
@@ -25997,17 +26117,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 "Vegahótel"
@@ -26015,20 +26135,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 "Breyti vegahóteli"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -26036,10 +26156,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 "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -26047,15 +26167,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 "Breyti farfuglaheimili"
 
 #. 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 ""
@@ -26063,10 +26183,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
@@ -26074,30 +26194,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 "Tjaldstæði"
@@ -26105,10 +26225,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 "Breyti tjaldstæði"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -26119,5 +26239,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 "Veitingastaður"
@@ -26125,5 +26245,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 "Breyti veitingastað"
@@ -26132,6 +26252,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 "Matargerð"
@@ -26139,5 +26259,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 "ítölsk"
@@ -26145,5 +26265,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 "kínversk"
@@ -26151,5 +26271,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"
@@ -26157,5 +26277,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 "hamborgarar"
@@ -26163,5 +26283,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 "grísk"
@@ -26169,5 +26289,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 "þýsk"
@@ -26175,5 +26295,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 "indversk"
@@ -26181,5 +26301,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 "að hætti heimamanna"
@@ -26187,5 +26307,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 ""
@@ -26193,5 +26313,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 "tyrknesk"
@@ -26199,5 +26319,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 "asísk"
@@ -26205,5 +26325,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 "tælensk"
@@ -26211,5 +26331,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 "mexíkósk"
@@ -26217,5 +26337,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 "japönsk"
@@ -26223,5 +26343,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 ""
@@ -26229,5 +26349,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 ""
@@ -26235,5 +26355,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 ""
@@ -26241,10 +26361,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 "Skyndibiti"
@@ -26252,20 +26372,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 "Breyti skyndibitastað"
 
 #. 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 ""
@@ -26273,10 +26393,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 "Kaffihús"
@@ -26284,15 +26404,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 "Breyti kaffihúsi"
 
 #. 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 "Bar"
@@ -26300,20 +26420,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 "Breyti bar"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2186
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr ""
@@ -26321,10 +26441,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 "Næturklúbbur"
@@ -26332,25 +26452,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 "Breyti næturklúbb"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -26358,10 +26478,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 "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr ""
@@ -26369,20 +26489,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr ""
@@ -26415,32 +26535,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 "stræti"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr ""
@@ -26449,6 +26569,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 "Nánari lýsing"
@@ -26458,5 +26578,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 ""
@@ -26464,5 +26584,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 ""
@@ -26471,6 +26591,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 ""
@@ -26478,5 +26598,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 ""
@@ -26485,6 +26605,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 "Skíði"
@@ -26492,5 +26612,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 ""
@@ -26498,50 +26618,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 "Fræðsluskilti"
 
 #. 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 "sagnfræði"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "náttúran"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
 msgstr "dýralíf"
 
 #. 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 ""
@@ -26549,10 +26669,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2301 build/trans_presets.java:2311
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
 msgid "Closer description"
 msgstr ""
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr ""
@@ -26560,25 +26680,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 "Frístundir"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -26587,10 +26707,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 "Breyti kvikmyndahúsi"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -26599,10 +26719,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 "Breyti dýragarð"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -26611,45 +26731,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 "Skemmtigarður"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr ""
@@ -26659,5 +26779,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 ""
@@ -26685,20 +26805,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 "Aðgangur"
@@ -26706,5 +26826,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -26712,15 +26832,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 "Breyti leikvöll"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr ""
@@ -26728,10 +26848,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 "Eldstæði"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
 msgstr ""
@@ -26739,15 +26859,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"
@@ -26755,30 +26870,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 "Fiskveiðar"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. 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 "Safn"
@@ -26786,10 +26896,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 "Breyti safni"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Leikhús"
@@ -26798,10 +26908,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 "Breyti leikhúsi"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Bókasafn"
@@ -26810,10 +26920,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 "Breyti bókasafni"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -26821,10 +26931,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 "Breyti listamiðstöð"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Listaverk"
@@ -26832,10 +26942,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 "Breyti listaverki"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -26845,5 +26955,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 "Breyti helgistað"
@@ -26852,6 +26962,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 ""
@@ -26860,6 +26970,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 ""
@@ -26868,6 +26978,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 ""
@@ -26876,6 +26986,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 ""
@@ -26884,6 +26994,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 ""
@@ -26892,6 +27002,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 ""
@@ -26900,6 +27010,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 ""
@@ -26908,6 +27018,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 ""
@@ -26916,6 +27026,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 ""
@@ -26924,6 +27034,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 ""
@@ -26932,6 +27042,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 ""
@@ -26940,6 +27050,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 ""
@@ -26948,6 +27058,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 ""
@@ -26956,6 +27066,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 ""
@@ -26964,6 +27074,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 ""
@@ -26972,6 +27082,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 ""
@@ -26980,6 +27090,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 ""
@@ -26988,6 +27098,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 ""
@@ -26996,6 +27106,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 ""
@@ -27004,6 +27114,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 ""
@@ -27012,6 +27122,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 ""
@@ -27020,6 +27130,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 ""
@@ -27028,6 +27138,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 ""
@@ -27036,6 +27146,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 ""
@@ -27044,6 +27154,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 ""
@@ -27052,6 +27162,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 ""
@@ -27060,6 +27170,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 ""
@@ -27068,6 +27178,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 ""
@@ -27076,36 +27186,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 ""
@@ -27113,15 +27223,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 ""
@@ -27129,5 +27239,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 "Opinber bygging"
@@ -27135,10 +27245,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 "Breyti opinberri byggingu"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -27146,5 +27256,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 "Breyti ráðhúsi"
@@ -27153,10 +27263,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 "Sendiráð"
@@ -27164,10 +27274,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 "Breyti sendiráði"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -27176,10 +27286,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 "Breyti dómshúsi"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Fangelsi"
@@ -27188,10 +27298,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 "Breyti fangelsi"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -27201,10 +27311,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 "Breyti lögreglustöð"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -27213,10 +27323,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 "Breyti slökkvistöð"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Pósthús"
@@ -27224,25 +27334,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 "Breyti pósthúsi"
 
 #. 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 "Leikskóli"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "Skóli"
@@ -27250,10 +27360,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 "Breyti skóla"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Háskóli"
@@ -27261,10 +27371,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 "Breyti háskóla"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "Menntaskóli"
@@ -27272,10 +27382,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 "Breyti menntaskóla"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr ""
@@ -27283,20 +27393,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 "Heilsa"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Spítali"
@@ -27304,10 +27414,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 "Breyti spítala"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "Læknir"
@@ -27315,25 +27425,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 "Breyti lækni"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
 #. 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 ""
@@ -27341,5 +27451,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -27347,5 +27457,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 "Apótek"
@@ -27353,10 +27463,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 ""
@@ -27364,5 +27474,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 ""
@@ -27370,5 +27480,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -27376,5 +27486,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 "Breyti barnalúgu"
@@ -27382,5 +27492,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr ""
@@ -27389,5 +27499,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 ""
@@ -27396,15 +27506,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 ""
@@ -27413,5 +27523,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -27420,10 +27530,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 "Breyti dýralækni"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr ""
@@ -27431,15 +27541,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 "Athugasemd"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -27448,15 +27558,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 "Breyti almenningssíma"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr ""
@@ -27465,5 +27575,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 ""
@@ -27473,5 +27583,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 ""
@@ -27479,5 +27589,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"
@@ -27486,5 +27596,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"
@@ -27492,5 +27602,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -27498,5 +27608,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -27504,60 +27614,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 ""
@@ -27565,5 +27670,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -27572,5 +27677,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 "Breyti endurvinnslustöð"
@@ -27578,40 +27683,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. 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 ""
@@ -27619,5 +27724,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 ""
@@ -27626,30 +27731,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"
@@ -27657,5 +27762,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -27663,5 +27768,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -27669,5 +27774,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -27675,5 +27780,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -27681,5 +27786,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -27687,5 +27792,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -27693,20 +27798,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 "Breyti skýli"
 
 #. 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"
@@ -27714,5 +27819,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"
@@ -27720,5 +27825,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"
@@ -27726,5 +27831,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"
@@ -27732,10 +27837,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27744,10 +27849,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 "Hæð"
 
 #. 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"
@@ -27755,20 +27860,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr ""
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr ""
@@ -27776,5 +27881,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -27783,10 +27888,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 "Breyti drykkjarvatni"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr ""
@@ -27795,5 +27900,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 ""
@@ -27801,5 +27906,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"
@@ -27807,5 +27912,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -27813,5 +27918,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -27819,16 +27924,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"
@@ -27836,5 +27941,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"
@@ -27842,5 +27947,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27848,26 +27953,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 ""
@@ -27875,20 +27975,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 "Íþróttir"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -27902,6 +28002,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 "veldu íþrótt:"
@@ -28247,34 +28347,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 "íþrótt"
@@ -28284,6 +28384,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 ""
@@ -28293,6 +28393,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 "bogfimi"
@@ -28302,6 +28402,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 ""
@@ -28311,6 +28411,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 ""
@@ -28320,6 +28420,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 "ástralskur fótbolti"
@@ -28329,6 +28429,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 "hafnabolti"
@@ -28338,6 +28438,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 "körfubolti"
@@ -28347,6 +28447,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 ""
@@ -28356,6 +28456,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 ""
@@ -28365,6 +28465,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 ""
@@ -28374,6 +28474,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 ""
@@ -28383,6 +28483,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 "klifur"
@@ -28392,6 +28492,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 ""
@@ -28401,6 +28501,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 ""
@@ -28410,6 +28510,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 ""
@@ -28419,6 +28519,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 ""
@@ -28428,6 +28528,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 ""
@@ -28437,6 +28537,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 ""
@@ -28446,6 +28546,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 ""
@@ -28455,6 +28555,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 ""
@@ -28464,6 +28564,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 ""
@@ -28473,6 +28573,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 "hokkí"
@@ -28482,6 +28582,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 ""
@@ -28491,6 +28591,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 ""
@@ -28500,6 +28600,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 ""
@@ -28509,6 +28609,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 ""
@@ -28518,6 +28618,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 ""
@@ -28527,6 +28627,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 ""
@@ -28536,6 +28636,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 "skotfimi"
@@ -28545,6 +28645,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 ""
@@ -28554,6 +28654,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 "skautar"
@@ -28563,6 +28663,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 "skíði"
@@ -28572,6 +28672,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 "fótbolti"
@@ -28581,6 +28681,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 "sund"
@@ -28590,6 +28690,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 "borðtennis"
@@ -28599,71 +28699,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "tennis"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2764
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. 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 "Breyti íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. 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 "Breyti golfvelli"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2797
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2798
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. 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 ""
@@ -28711,25 +28811,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 "gerð"
@@ -28779,26 +28879,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 "völlur"
@@ -28848,26 +28948,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 "íþróttamiðstöð"
@@ -28912,149 +29012,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 "íþróttaleikvangur"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2811
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -29062,60 +29162,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 "Breyti skíðasvæði"
 
 #. 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 "Skotfimi"
@@ -29123,105 +29223,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 "Breyti skotfimi"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
 #. 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 "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr ""
@@ -29229,10 +29329,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 ""
@@ -29240,120 +29340,120 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2972
 msgid "Edit Beachvolleyball"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2980
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3021
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3022
 msgid "Edit Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3027
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3028
 msgid "Edit Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Borð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 "Breyti borðtennis"
 
 #. 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 "Breyti tennis"
@@ -29361,40 +29461,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 ""
@@ -29402,20 +29502,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 ""
@@ -29423,10 +29523,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 "Mannvirki"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "Bygging"
@@ -29434,25 +29534,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 "Turn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. 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 ""
@@ -29461,5 +29561,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 ""
@@ -29467,5 +29567,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr ""
@@ -29475,15 +29575,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr ""
@@ -29491,10 +29591,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 "Vindmylla"
@@ -29502,20 +29602,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 "Breyti vindmyllu"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -29524,5 +29624,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 "Breyti leiðslu"
@@ -29566,8 +29666,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
@@ -29577,10 +29677,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3136 build/trans_presets.java:3263
+#: build/trans_presets.java:3137 build/trans_presets.java:3264
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr ""
@@ -29588,20 +29688,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"
@@ -29609,5 +29709,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"
@@ -29615,5 +29715,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Krani"
@@ -29621,10 +29721,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 "Breyti krana"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr ""
@@ -29633,25 +29733,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 ""
@@ -29659,5 +29759,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 ""
@@ -29665,5 +29765,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 ""
@@ -29671,5 +29771,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 ""
@@ -29678,6 +29778,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 ""
@@ -29685,5 +29785,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 ""
@@ -29691,5 +29791,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 ""
@@ -29697,5 +29797,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 ""
@@ -29703,5 +29803,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 ""
@@ -29709,5 +29809,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 ""
@@ -29715,5 +29815,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 ""
@@ -29721,5 +29821,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 ""
@@ -29727,5 +29827,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 ""
@@ -29733,5 +29833,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 ""
@@ -29739,5 +29839,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 ""
@@ -29745,5 +29845,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 ""
@@ -29751,5 +29851,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 ""
@@ -29757,5 +29857,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 ""
@@ -29763,10 +29863,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 ""
@@ -29774,10 +29874,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 ""
@@ -29785,10 +29885,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 ""
@@ -29796,15 +29896,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. 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 "Breyti vatnsturni"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr ""
@@ -29812,10 +29912,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 ""
@@ -29825,10 +29925,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3187
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr ""
@@ -29836,10 +29936,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 "Gosbrunnur"
@@ -29848,10 +29948,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 "Breyti gosbrunn"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr ""
@@ -29859,5 +29959,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 ""
@@ -29865,5 +29965,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Viti"
@@ -29871,5 +29971,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 "Breyti vita"
@@ -29877,10 +29977,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 ""
@@ -29888,5 +29988,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 ""
@@ -29895,15 +29995,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 ""
@@ -29911,55 +30011,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"
@@ -29967,5 +30067,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr ""
@@ -29973,10 +30073,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 "Eftirlitsmyndavél"
@@ -29984,30 +30084,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 "Breyti eftirlitsmyndavél"
 
 #. 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 "Rafall"
@@ -30017,140 +30117,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 "Breyti rafli"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biofuel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biogas"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biomass"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "diesel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "gasoline"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "geothermal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "hydro"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "osmotic"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "solar"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "tidal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "waste"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wave"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wind"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "Method"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "anaerobic_digestion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "combustion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "dam"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fission"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fusion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "gasification"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumped-storage"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumping"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pyrolysis"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "run-of-the-river"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "thermal"
 msgstr ""
@@ -30158,10 +30258,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 ""
@@ -30176,9 +30276,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 ""
@@ -30193,9 +30293,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 ""
@@ -30210,9 +30310,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 ""
@@ -30227,54 +30327,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 "Orkuver"
@@ -30283,10 +30383,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 "Breyti orkuveri"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -30295,5 +30395,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 "Breyti spennustöð"
@@ -30301,10 +30401,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 "Tilvísunarnúmer línunnar"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -30313,5 +30413,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 ""
@@ -30319,5 +30419,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -30328,5 +30428,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 "Breyti háspennustaur"
@@ -30334,10 +30434,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 ""
@@ -30346,5 +30446,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 ""
@@ -30352,10 +30452,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 "Raflína"
@@ -30364,15 +30464,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 "Breyti raflínu"
 
 #. 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"
@@ -30380,5 +30480,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"
@@ -30386,40 +30486,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 "Sögustaðir"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Kastali"
@@ -30428,20 +30528,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 "Breyti kastala"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -30450,10 +30550,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 "Breyti fornleifasvæði"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -30461,10 +30561,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 "Breyti vígvelli"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
 msgstr ""
@@ -30472,5 +30572,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 ""
@@ -30478,15 +30578,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3370
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -30494,60 +30594,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 "Breyti minnisvarða"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "Verslanir"
 
 #. 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 ""
@@ -30555,10 +30655,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3407
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -30566,5 +30666,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 "Breyti sjoppu"
@@ -30572,5 +30672,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Bakarí"
@@ -30578,10 +30678,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 "Breyti bakaríi"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Slátrari"
@@ -30589,10 +30689,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 "Breyti slátrara"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr ""
@@ -30600,10 +30700,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 ""
@@ -30611,10 +30711,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 ""
@@ -30622,5 +30722,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 ""
@@ -30628,5 +30728,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr ""
@@ -30634,10 +30734,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 ""
@@ -30645,15 +30745,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 "Lífræn búð"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
@@ -30661,5 +30761,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr ""
@@ -30667,25 +30767,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 "Vínbúð"
 
 #. 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 ""
@@ -30693,20 +30793,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 "Skóbúð"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -30714,10 +30814,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 "Breyti útivistarbúð"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
 msgstr ""
@@ -30725,5 +30825,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -30731,10 +30831,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 "Breyti efnalaug"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -30742,20 +30842,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 "Breyti þvottahúsi"
 
 #. 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 ""
@@ -30763,35 +30863,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 "Tölvubúð"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr ""
@@ -30799,10 +30899,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 ""
@@ -30810,35 +30910,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 "Hljómtækjaverslun"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
 #. 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 "Fjármál"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Banki"
@@ -30846,5 +30946,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 "Breyti banka"
@@ -30852,10 +30952,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 "Hraðbanki"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -30863,5 +30963,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 "Breyti gjaldeyrisskiptum"
@@ -30869,10 +30969,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 "Breyti hraðbanka"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr ""
@@ -30880,10 +30980,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 ""
@@ -30891,5 +30991,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 ""
@@ -30897,35 +30997,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 "Hársnyrtir"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
 #. 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 "Breyti sjóntækjasmið"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr ""
@@ -30933,10 +31033,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 ""
@@ -30944,5 +31044,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 ""
@@ -30950,5 +31050,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "Blómabúð"
@@ -30956,10 +31056,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 "Breyti blómabúð"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr ""
@@ -30967,5 +31067,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 ""
@@ -30973,5 +31073,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -30979,10 +31079,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
 #. item "Other/Do-it-yourself-store" label "Edit Do-it-yourself-store"
-#: build/trans_presets.java:3706
+#: build/trans_presets.java:3707
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr ""
@@ -30990,10 +31090,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 ""
@@ -31001,5 +31101,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 ""
@@ -31007,15 +31107,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
 msgstr ""
@@ -31023,10 +31123,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 ""
@@ -31034,10 +31134,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 ""
@@ -31045,5 +31145,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 ""
@@ -31051,15 +31151,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
 msgstr ""
@@ -31067,15 +31167,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 ""
@@ -31083,15 +31183,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr ""
@@ -31099,20 +31199,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 "Dótabúð"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
 msgstr ""
@@ -31120,10 +31220,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 "Sjálfsali"
@@ -31131,5 +31231,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 ""
@@ -31137,180 +31237,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "Vending products"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "dagblöð"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "dót"
 
 #. 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 "Landafræði"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr ""
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr ""
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr ""
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr ""
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr ""
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:3859
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Staðir"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. 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"
@@ -31318,10 +31418,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31329,25 +31429,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -31355,5 +31455,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
@@ -31362,10 +31462,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "Bær"
@@ -31373,10 +31473,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 "Breyti bæ"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Hverfi"
@@ -31384,35 +31484,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 "Breyti hverfi"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
 
 #. 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 ""
@@ -31420,5 +31520,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr ""
@@ -31426,10 +31526,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 "Tindur"
@@ -31437,10 +31537,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 "Breyti tind"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Jökull"
@@ -31448,10 +31548,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 "Breyti jökli"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -31459,10 +31559,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 "Breyti eldfjalli"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -31470,5 +31570,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 "Breyti hellismunna"
@@ -31476,5 +31576,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Eyja"
@@ -31482,10 +31582,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 "Breyti eyju"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr ""
@@ -31493,15 +31593,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 "Tré"
@@ -31510,15 +31610,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 "Breyti tré"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "Skógur"
@@ -31527,10 +31627,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 "Breyti skóg"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -31538,5 +31638,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -31544,5 +31644,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -31550,5 +31650,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -31557,30 +31657,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 "Breyti ræktuðum skóg"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "barrskógur"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "laufskógur"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "blandaður"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -31588,15 +31688,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr ""
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr ""
@@ -31604,20 +31704,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:4046
+#: build/trans_presets.java:4047
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr ""
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr ""
@@ -31625,15 +31725,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4057
+#: build/trans_presets.java:4058
 msgid "Edit Heath"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Landnýting"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr ""
@@ -31642,40 +31742,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4066
+#: build/trans_presets.java:4067
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31683,15 +31783,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4092
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4098
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -31699,25 +31799,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr ""
@@ -31725,10 +31825,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 ""
@@ -31736,20 +31836,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 "Almenningsgarður"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr ""
@@ -31757,5 +31857,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 ""
@@ -31763,15 +31863,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -31779,10 +31879,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 "Breyti grafreit"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr ""
@@ -31790,40 +31890,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 "Breyti kirkjugarðslandnýtingu"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr ""
@@ -31831,10 +31931,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 ""
@@ -31842,15 +31942,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4193
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr ""
@@ -31858,55 +31958,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr ""
@@ -31914,5 +32014,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
@@ -31923,5 +32023,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 "Breyti heimilisfangi"
@@ -31929,5 +32029,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Húsnúmer"
@@ -31935,5 +32035,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Nafn húss"
@@ -31942,55 +32042,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 "Nafn götu"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Landskóði"
 
 #. 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 ""
@@ -31998,5 +32098,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
@@ -32008,5 +32108,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 ""
@@ -32014,35 +32114,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr ""
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr ""
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr ""
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4259
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4260
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4268
+#: build/trans_presets.java:4269
 msgid "Image"
 msgstr ""
@@ -32052,5 +32152,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 "Breyta marghyrningi"
@@ -32062,5 +32162,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 ""
@@ -32068,5 +32168,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 ""
@@ -32074,5 +32174,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr ""
@@ -32083,5 +32183,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 ""
@@ -32089,46 +32189,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 "Beygjutakmörkun"
@@ -32137,5 +32242,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 "Breyti beygjutakmörkun"
@@ -32143,40 +32248,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
 #. 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 "aðeins_beint_fram"
@@ -32185,15 +32290,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "af vegi"
 
 #. 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 "að vegi"
@@ -32201,5 +32306,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr ""
@@ -32213,5 +32318,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 ""
@@ -32221,5 +32326,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 ""
@@ -32227,5 +32332,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
@@ -32235,5 +32340,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 ""
@@ -32241,5 +32346,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 ""
@@ -32247,5 +32352,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 ""
@@ -32298,9 +32403,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 "fótgangandi"
@@ -32308,5 +32413,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 ""
@@ -32314,5 +32419,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
@@ -32322,5 +32427,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 ""
@@ -32334,6 +32439,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
@@ -32343,5 +32448,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 ""
@@ -32353,6 +32458,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 ""
@@ -32360,5 +32465,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 ""
@@ -32366,5 +32471,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 ""
@@ -32372,5 +32477,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 ""
@@ -32378,5 +32483,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 ""
@@ -32384,5 +32489,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 ""
@@ -32390,5 +32495,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 ""
@@ -32400,15 +32505,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 ""
@@ -32416,5 +32521,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 ""
@@ -32422,5 +32527,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 ""
@@ -32428,5 +32533,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 ""
@@ -32434,5 +32539,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32446,25 +32551,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 ""
@@ -32472,5 +32577,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -32478,5 +32583,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 ""
@@ -32485,5 +32590,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr ""
@@ -32491,5 +32596,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr ""
@@ -32497,10 +32602,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 ""
@@ -32695,6 +32800,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 ""
@@ -32726,5 +32831,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 ""
@@ -32879,10 +32984,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 ""
@@ -32927,5 +33029,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr ""
@@ -32969,7 +33071,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 ""
@@ -33043,5 +33145,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 "vegþjónustur"
@@ -33053,5 +33155,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr ""
@@ -33069,5 +33171,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 ""
@@ -33078,5 +33180,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "beygjuhringur"
@@ -33089,5 +33191,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 ""
@@ -33099,5 +33201,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 "árbakki"
@@ -33109,5 +33211,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "lækur"
@@ -33119,5 +33221,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr ""
@@ -33307,17 +33409,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 ""
@@ -33329,5 +33431,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr ""
@@ -33375,8 +33477,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 ""
 
@@ -33394,10 +33514,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 ""
@@ -33425,7 +33545,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 ""
@@ -33460,6 +33580,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 ""
@@ -33477,5 +33597,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 ""
@@ -33493,5 +33613,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 ""
@@ -33551,8 +33671,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 "skíðalyfta"
@@ -33566,5 +33686,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 ""
@@ -33576,5 +33696,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 ""
@@ -33586,5 +33706,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 ""
@@ -33596,5 +33716,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 ""
@@ -33606,5 +33726,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 ""
@@ -33616,5 +33736,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 ""
@@ -33743,13 +33863,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 ""
@@ -33760,5 +33880,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 "bryggja"
@@ -33770,5 +33890,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "leiðsla"
@@ -33884,13 +34004,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 "frístundir"
@@ -33902,5 +34022,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "smábátahöfn"
@@ -33974,10 +34094,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 ""
@@ -34061,11 +34181,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 ""
@@ -34401,24 +34521,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 ""
@@ -34444,6 +34564,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 ""
@@ -34490,8 +34610,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 ""
@@ -34860,34 +34980,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 ""
@@ -34943,8 +35063,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 "hótel"
@@ -35020,9 +35140,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 "ferðamennska"
@@ -35090,9 +35210,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 ""
@@ -35159,9 +35279,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 ""
@@ -35172,5 +35292,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr ""
@@ -35182,5 +35302,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr ""
@@ -35198,5 +35318,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 ""
@@ -35208,5 +35328,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -35218,5 +35338,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr ""
@@ -35228,5 +35348,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr ""
@@ -35245,5 +35365,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 "smásala"
@@ -35255,5 +35375,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "iðnaður"
@@ -35265,5 +35385,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr ""
@@ -35275,5 +35395,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr ""
@@ -35285,5 +35405,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr ""
@@ -35328,7 +35448,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 ""
@@ -35340,5 +35460,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr ""
@@ -35349,5 +35469,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "tindur"
@@ -35360,5 +35480,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ökul"
@@ -35370,5 +35490,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 "eldfjall"
@@ -35410,8 +35530,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 ""
@@ -35423,5 +35543,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr ""
@@ -35433,5 +35553,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr ""
@@ -35443,5 +35563,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr ""
@@ -35453,5 +35573,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "leðja"
@@ -35463,5 +35583,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "strönd"
@@ -35521,8 +35641,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 ""
@@ -35601,12 +35721,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 ""
@@ -35722,11 +35842,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 ""
@@ -35738,5 +35858,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
 msgstr ""
@@ -35772,6 +35892,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"
@@ -36012,9 +36132,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"
@@ -36022,44 +36141,31 @@
 #. <type>wms</type>
 #. <default>true</default>
-#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>NASA:4326</code><code>EPSG:32641</code><code>EPSG:3857</code><code>EPSG:3785</code><code>EPSG:32642</code><code>EPSG:32640</code>
+#. <code>EPSG:4326</code><code>EPSG:900913</code><code>EPSG:3395</code><code>EPSG:32639</code><code>EPSG:32638</code><code>EPSG:32637</code>
+#. <code>EPSG:32636</code><code>EPSG:32635</code>
+#. </projections>
 #. </entry>
-#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
-#. <entry>
-#. <name>Open Aerial Map</name>
-#: build/trans_wms.java:12
-msgid "Open Aerial Map"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
-#. </entry>
+#.
 #. <!--different forms for web access-->
-#. <!--true;Bing Sat;bing:bing-->
+#.
 #. <entry>
 #. <name>Bing Sat</name>
-#: build/trans_wms.java:19
+#: build/trans_wms.java:18
 msgid "Bing Sat"
 msgstr ""
 
 #. <type>bing</type>
+#. <default>true</default>
 #. <!-- url is used as identifier, so put something here -->
 #. <url>http://www.bing.com/maps/</url>
-#. <default>true</default>
 #. </entry>
-#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
-#. <entry>
-#. <name>Yahoo Sat</name>
-#: build/trans_wms.java:27
-msgid "Yahoo Sat"
-msgstr ""
-
-#. <type>html</type>
-#. <url><![CDATA[http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?]]></url>
-#. </entry>
+#.
 #. <!--Tile based access-->
-#. <!--true;MapQuest Open Aerial;tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png-->
+#.
 #. <entry>
 #. <name>MapQuest Open Aerial</name>
-#: build/trans_wms.java:34
+#: build/trans_wms.java:28
 msgid "MapQuest Open Aerial"
 msgstr ""
@@ -36067,11 +36173,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 ""
@@ -36079,73 +36184,100 @@
 #. <type>tms</type>
 #. <default>true</default>
-#. <url><![CDATA[http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://tile.openstreetmap.org/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--false;OpenCycleMap;tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm-->
+#.
+#. <entry>
+#. <name>OpenStreetMap (Mapnik Black &amp; White)</name>
+#: build/trans_wms.java:45
+msgid "OpenStreetMap (Mapnik Black & White)"
+msgstr ""
+
+#. <type>tms</type>
+#. <default>true</default>
+#. <url>http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://openstreetmap.org/</attribution-url>
+#. </entry>
+#.
 #. <entry>
 #. <name>OpenCycleMap</name>
-#: build/trans_wms.java:62
+#: build/trans_wms.java:55
 msgid "OpenCycleMap"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://tile.opencyclemap.org/cycle/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>17</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--false;TilesAtHome;tms[17]:http://tah.openstreetmap.org/Tiles/tile;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <name>TilesAtHome</name>
-#: build/trans_wms.java:71
-msgid "TilesAtHome"
+#. <name>OpenStreetMap (TilesAtHome)</name>
+#: build/trans_wms.java:64
+msgid "OpenStreetMap (TilesAtHome)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://tah.openstreetmap.org/Tiles/tile/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>17</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--false;MapQuest OSM;tms[18]:http://otile1.mqcdn.com/tiles/1.0.0/osm;;;osm;osm;osm-->
+#.
 #. <entry>
 #. <name>MapQuest OSM</name>
-#: build/trans_wms.java:80
+#: build/trans_wms.java:73
 msgid "MapQuest OSM"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
-#. <!--ODBL map has zoom 1-4, but the tiles are empty-->
-#. <!--false;ODBL coverage;tms[5,18]:http://osm.informatik.uni-leipzig.de/osm_tiles2;;;osm;osm;osm-->
+#.
 #. <entry>
 #. <name>ODBL coverage</name>
-#: build/trans_wms.java:90
+#: build/trans_wms.java:82
 msgid "ODBL coverage"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png]]></url>
-#. <min-zoom>5</min-zoom>
+#. <url>http://osm.informatik.uni-leipzig.de/osm_tiles2/{zoom}/{x}/{y}.png</url>
+#. <min-zoom>5</min-zoom> <!--ODBL map has zoom 1-4, but the tiles are empty-->
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
 #. <attribution-url>http://openstreetmap.org/</attribution-url>
 #. </entry>
+#.
+#. <entry>
+#. <name>Public Transport (ÖPNV)</name>
+#: build/trans_wms.java:92
+msgid "Public Transport (ÖPNV)"
+msgstr ""
+
+#. <type>tms</type>
+#. <url>http://tile.memomaps.de/tilegen/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>18</max-zoom>
+#. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
+#. <attribution-url>http://öpnvkarte.de/</attribution-url>
+#. </entry>
+#.
 #. <!--only for Europe-->
-#. <!--false;ÖPNV;tms[18]:http://tile.xn- ### -pnvkarte-m4a.de/tilegen;;;osm;osm;osm-->
+#.
 #. <entry>
-#. <name>ÖPNV</name>
-#: build/trans_wms.java:101
-msgid "ÖPNV"
+#. <name>OpenStreetMap (German Style)</name>
+#: build/trans_wms.java:103
+msgid "OpenStreetMap (German Style)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://tile.xn--pnvkarte-m4a.de/tilegen/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://{switch:a,b,c,d}.tile.openstreetmap.de/tiles/osmde/{zoom}/{x}/{y}.png</url>
 #. <max-zoom>18</max-zoom>
 #. <attribution-text mandatory='true'>© OpenStreetMap contributors, CC-BY-SA</attribution-text>
@@ -36153,29 +36285,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>
@@ -36183,13 +36330,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>
@@ -36197,13 +36344,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>
@@ -36211,13 +36358,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>
@@ -36227,273 +36374,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"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>GB</country-code>
 #. </entry>
-#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
-#. <entry>
-#. <name>NPE Maps (Tim)</name>
-#: build/trans_wms.java:236
-msgid "NPE Maps (Tim)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://timsc.dev.openstreetmap.org/wms2/map.php?]]></url>
-#. <country-code>GB</country-code>
-#. </entry>
-#. <!--false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&-->
-#. <entry>
-#. <name>7th Series (OS7)</name>
-#: build/trans_wms.java:243
-msgid "7th Series (OS7)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
-#. <country-code>GB</country-code>
-#. </entry>
-#. <!--only for Japan-->
-#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO)</name>
-#: build/trans_wms.java:251
-msgid "MLIT Japan (ORTHO)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO01)</name>
-#: build/trans_wms.java:258
-msgid "MLIT Japan (ORTHO01)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO02)</name>
-#: build/trans_wms.java:265
-msgid "MLIT Japan (ORTHO02)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO03)</name>
-#: build/trans_wms.java:272
-msgid "MLIT Japan (ORTHO03)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
+#.
 #. <!--only for Italy-->
-#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#.
 #. <entry>
 #. <name>Lodi - Italy</name>
-#: build/trans_wms.java:280
+#: build/trans_wms.java:533
 msgid "Lodi - Italy"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&]]></url>
+#. <url><![CDATA[http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:32632</code><code>EPSG:4326</code>
+#. </projections>
 #. <country-code>IT</country-code>
 #. </entry>
-#. <!--false;Sicily - Italy;http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&-->
+#.
 #. <entry>
 #. <name>Sicily - Italy</name>
-#: build/trans_wms.java:287
+#: build/trans_wms.java:543
 msgid "Sicily - Italy"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&]]></url>
+#. <url><![CDATA[http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&LAYERS=0&STYLES=default&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>CRS:84</code><code>EPSG:4326</code><code>EPSG:32633</code>
+#. </projections>
 #. <country-code>IT</country-code>
 #. </entry>
-#. <!--false;PCN 2006 - Italy;http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&-->
+#.
 #. <entry>
 #. <name>PCN 2006 - Italy</name>
-#: build/trans_wms.java:294
+#: build/trans_wms.java:553
 msgid "PCN 2006 - Italy"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&]]></url>
+#. <url><![CDATA[http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:4326</code>
+#. </projections>
 #. <country-code>IT</country-code>
 #. </entry>
+#.
 #. <!--only for France-->
-#. <!--false;SPOTMaps (France);http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html-->
+#.
 #. <entry>
-#. <name>SPOTMaps (France)</name>
-#: build/trans_wms.java:302
-msgid "SPOTMaps (France)"
+#. <name>CRAIG - Auvergne 30 cm</name>
+#: build/trans_wms.java:565
+msgid "CRAIG - Auvergne 30 cm"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&]]></url>
-#. <eula mandatory='true'><![CDATA[http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html]]></eula>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=auvergne&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>EPSG:2154</code><code>EPSG:4326</code><code>EPSG:3785</code><code>EPSG:3857</code><code>EPSG:900913</code><code>EPSG:4171</code>
+#. </projections>
+#. <bounds min-lat='44.604' min-lon='2.045' max-lat='46.822' max-lon='4.507'>
+#. <shape>
+#. <point lat='45.4023663' lon='2.4599585' /><point lat='45.4286348' lon='2.3254017' /><point lat='44.9943663' lon='2.0451281' />
+#. <point lat='44.6038115' lon='2.1840500' /><point lat='44.6327309' lon='2.5051357' /><point lat='44.9171210' lon='2.7307249' />
+#. <point lat='44.6338266' lon='2.9401391' /><point lat='44.8768328' lon='3.1298041' /><point lat='44.8497399' lon='3.2056710' />
+#. <point lat='44.9439360' lon='3.3391344' /><point lat='44.7949731' lon='3.4520304' /><point lat='44.8615633' lon='3.6424809' />
+#. <point lat='44.7248374' lon='3.8871598' /><point lat='44.9500272' lon='4.3282054' /><point lat='45.1774345' lon='4.5055095' />
+#. <point lat='45.3819241' lon='4.3576878' /><point lat='45.3864069' lon='3.9168916' /><point lat='45.5071399' lon='4.0149721' />
+#. <point lat='45.6838545' lon='3.8053434' /><point lat='45.9552827' lon='3.7322737' /><point lat='45.9681345' lon='3.8489116' />
+#. <point lat='46.2250239' lon='3.8135926' /><point lat='46.3179797' lon='4.0296102' /><point lat='46.4658971' lon='4.0317945' />
+#. <point lat='46.5490366' lon='3.7600585' /><point lat='46.7794611' lon='3.6255192' /><point lat='46.6855890' lon='3.4878525' />
+#. <point lat='46.6999834' lon='3.1728686' /><point lat='46.8217147' lon='2.9377911' /><point lat='46.6718198' lon='2.5467951' />
+#. <point lat='46.5508339' lon='2.5662523' /><point lat='46.4813144' lon='2.2747709' /><point lat='46.3216155' lon='2.2762271' />
+#. <point lat='46.2543249' lon='2.4722891' /><point lat='46.0383633' lon='2.5720279' /><point lat='45.9014582' lon='2.5141257' />
+#. <point lat='45.8340658' lon='2.3591137' /><point lat='45.7131887' lon='2.4954764' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009-2010</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
 #. <country-code>FR</country-code>
 #. </entry>
+#. <entry>
+#. <name>CRAIG - Moulins 15 cm</name>
+#: build/trans_wms.java:594
+msgid "CRAIG - Moulins 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=moulins&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='46.375' min-lon='3.114' max-lat='46.727' max-lon='3.583'>
+#. <shape>
+#. <point lat='46.6531780' lon='3.1146301' /><point lat='46.5920091' lon='3.1831503' /><point lat='46.5181677' lon='3.1242169' />
+#. <point lat='46.4572002' lon='3.2021956' /><point lat='46.4032478' lon='3.2019816' /><point lat='46.4367347' lon='3.3192065' />
+#. <point lat='46.3753806' lon='3.4843655' /><point lat='46.4629787' lon='3.5047376' /><point lat='46.4693756' lon='3.5831443' />
+#. <point lat='46.5367773' lon='3.5542126' /><point lat='46.5643267' lon='3.4371161' /><point lat='46.5980967' lon='3.5157796' />
+#. <point lat='46.6585831' lon='3.5065351' /><point lat='46.7195593' lon='3.4479710' /><point lat='46.6929990' lon='3.3202336' />
+#. <point lat='46.7268725' lon='3.2620707' /><point lat='46.6932339' lon='3.2127240' /><point lat='46.7204103' lon='3.1343174' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>CRAIG - Montluçon 15 cm</name>
+#: build/trans_wms.java:613
+msgid "CRAIG - Montluçon 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=montlucon&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='46.227' min-lon='2.402' max-lat='46.423' max-lon='2.665'>
+#. <shape>
+#. <point lat='46.4024966' lon='2.6645100' /><point lat='46.3421301' lon='2.6649110' /><point lat='46.2268652' lon='2.5389734' />
+#. <point lat='46.3068755' lon='2.4026079' /><point lat='46.3342581' lon='2.4900995' /><point lat='46.4154942' lon='2.5186332' />
+#. <point lat='46.4189481' lon='2.6050667' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>CRAIG - Vichy 15 cm</name>
+#: build/trans_wms.java:629
+msgid "CRAIG - Vichy 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=vichy&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='45.997' min-lon='3.249' max-lat='46.260' max-lon='3.569'>
+#. <shape>
+#. <point lat='46.2602882' lon='3.4354624' /><point lat='46.2328672' lon='3.5512292' /><point lat='46.1249603' lon='3.5210969' />
+#. <point lat='46.0103395' lon='3.5585919' /><point lat='45.9971752' lon='3.4621047' /><point lat='46.0582033' lon='3.4238371' />
+#. <point lat='46.0382361' lon='3.3170331' /><point lat='46.1122644' lon='3.2496785' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2009</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>CRAIG - Le Puy 15 cm</name>
+#: build/trans_wms.java:645
+msgid "CRAIG - Le Puy 15 cm"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.craig.fr/osm?service=wms&request=getmap&version=1.1.1&layers=le_puy&format=image/jpeg&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='44.866' min-lon='3.615' max-lat='45.145' max-lon='4.063'>
+#. <shape>
+#. <point lat='44.9473147' lon='3.9287401' /><point lat='44.8865557' lon='3.9277539' /><point lat='44.8668246' lon='3.8609471' />
+#. <point lat='44.9481465' lon='3.8241594' /><point lat='44.9419502' lon='3.7480171' /><point lat='44.9827588' lon='3.7009349' />
+#. <point lat='44.9628982' lon='3.6341145' /><point lat='45.0102731' lon='3.6156193' /><point lat='45.1451214' lon='3.6552711' />
+#. <point lat='45.1377837' lon='3.7506111' /><point lat='45.0969140' lon='3.7977339' /><point lat='45.1228864' lon='3.9316853' />
+#. <point lat='45.0136399' lon='4.0631198' /><point lat='44.9867619' lon='4.0530756' /><point lat='45.0007606' lon='3.9962471' />
+#. <point lat='44.9536830' lon='3.9763543' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title={lang}:WikiProject_France/CRAIG/EULA&action=render&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>Orthophotographie CRAIG/TopoGEODIS 2010</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/CRAIG</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>Géolittoral - Ortophotos 2000</name>
+#: build/trans_wms.java:664
+msgid "Géolittoral - Ortophotos 2000"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ortholittorale&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lon='-5.1986731' min-lat='43.3035717' max-lon='2.6068264' max-lat='51.1214375'>
+#. <shape>
+#. <point lat='48.8634633' lon='-1.9396630' /><point lat='48.9117889' lon='-1.9399349' /><point lat='48.9110507' lon='-1.7009983' />
+#. <point lat='48.8617305' lon='-1.6972613' />
+#. </shape>
+#. <shape>
+#. <point lat='47.4054194' lon='-3.0601800' /><point lat='47.2963471' lon='-2.8258703' /><point lat='47.3341715' lon='-2.7878715' />
+#. <point lat='47.4456259' lon='-3.0243638' />
+#. </shape>
+#. <shape>
+#. <point lat='47.4295047' lon='-3.2648203' /><point lat='47.3592752' lon='-3.3343030' /><point lat='47.3413278' lon='-3.2961388' />
+#. <point lat='47.3005706' lon='-3.3148902' /><point lat='47.2449216' lon='-3.1994054' /><point lat='47.2775103' lon='-3.1656728' />
+#. <point lat='47.2361201' lon='-3.0868640' /><point lat='47.3085541' lon='-3.0063687' />
+#. </shape>
+#. <shape>
+#. <point lat='46.6924223' lon='-2.4123238' /><point lat='46.6761120' lon='-2.3719717' /><point lat='46.6803260' lon='-2.2674923' />
+#. <point lat='46.7070521' lon='-2.2700680' /><point lat='46.7328597' lon='-2.2982682' /><point lat='46.7371145' lon='-2.4165505' />
+#. </shape>
+#. <shape>
+#. <point lat='46.1095893' lon='-1.0796243' /><point lat='46.0147437' lon='-0.9411452' /><point lat='45.1517801' lon='-0.5630573' />
+#. <point lat='45.0842493' lon='-0.7265951' /><point lat='45.3409360' lon='-0.8790355' /><point lat='45.3377907' lon='-0.9979449' />
+#. <point lat='44.6998247' lon='-0.9555838' /><point lat='44.1986482' lon='-1.1586189' /><point lat='44.2055773' lon='-1.2151202' />
+#. <point lat='43.9411421' lon='-1.3216793' /><point lat='43.9065485' lon='-1.2760964' /><point lat='43.4681233' lon='-1.4280594' />
+#. <point lat='43.4059107' lon='-1.6062745' /><point lat='43.3601202' lon='-1.6060955' /><point lat='43.3035717' lon='-1.7744064' />
+#. <point lat='43.3848410' lon='-1.8299531' /><point lat='43.4685563' lon='-1.5855116' /><point lat='44.0337366' lon='-1.3570598' />
+#. <point lat='44.0646122' lon='-1.4021655' /><point lat='44.2283161' lon='-1.3358385' /><point lat='44.2303255' lon='-1.2183610' />
+#. <point lat='44.4109713' lon='-1.1679453' /><point lat='44.4184720' lon='-1.3074387' /><point lat='45.5910689' lon='-1.1697949' />
+#. <point lat='46.0604176' lon='-1.4868470' /><point lat='46.0914593' lon='-1.3636417' /><point lat='46.1701852' lon='-1.6017590' />
+#. <point lat='46.2237487' lon='-1.6444184' /><point lat='46.3042640' lon='-1.5859481' /><point lat='46.3388783' lon='-1.5100772' />
+#. <point lat='46.4221446' lon='-1.7564280' /><point lat='46.8185697' lon='-2.1871988' /><point lat='46.8553436' lon='-2.1642284' />
+#. <point lat='46.9337048' lon='-2.2365406' /><point lat='46.9671834' lon='-2.3976918' /><point lat='47.0763113' lon='-2.2820042' />
+#. <point lat='47.0187450' lon='-2.1256261' /><point lat='47.0656240' lon='-2.0901262' /><point lat='47.1069799' lon='-2.1848720' />
+#. <point lat='47.1076296' lon='-2.2647018' /><point lat='47.1856218' lon='-2.2448935' /><point lat='47.2446686' lon='-2.5677926' />
+#. <point lat='47.4668599' lon='-2.6672667' /><point lat='47.4712158' lon='-2.7478721' /><point lat='47.4346122' lon='-2.7577135' />
+#. <point lat='47.4629031' lon='-2.8932063' /><point lat='47.5090529' lon='-2.9036899' /><point lat='47.5383308' lon='-3.0338252' />
+#. <point lat='47.5118452' lon='-3.0711295' /><point lat='47.4987314' lon='-3.0165289' /><point lat='47.4269256' lon='-3.1250228' />
+#. <point lat='47.4844142' lon='-3.1880328' /><point lat='47.6113186' lon='-3.2279087' /><point lat='47.6316051' lon='-3.2966969' />
+#. <point lat='47.6715415' lon='-3.2875957' /><point lat='47.6689257' lon='-3.3407355' /><point lat='47.5947342' lon='-3.3891187' />
+#. <point lat='47.6382724' lon='-3.5508700' /><point lat='47.7248840' lon='-3.5338384' /><point lat='47.7647571' lon='-3.7657669' />
+#. <point lat='47.7370960' lon='-3.7759528' /><point lat='47.7591549' lon='-3.9116771' /><point lat='47.7991129' lon='-3.8959022' />
+#. <point lat='47.8152607' lon='-3.9723628' /><point lat='47.7975006' lon='-3.9972201' /><point lat='47.7626769' lon='-3.9795600' />
+#. <point lat='47.7219346' lon='-3.8945008' /><point lat='47.6783103' lon='-3.9161956' /><point lat='47.7092072' lon='-4.1016259' />
+#. <point lat='47.7894357' lon='-4.0898857' /><point lat='47.7990868' lon='-4.0379763' /><point lat='47.8310926' lon='-4.0412502' />
+#. <point lat='47.8422143' lon='-4.0876491' /><point lat='47.8252534' lon='-4.1478057' /><point lat='47.7884708' lon='-4.1431427' />
+#. <point lat='47.7414997' lon='-4.3516237' /><point lat='47.9776016' lon='-4.4796232' /><point lat='47.9989633' lon='-4.9856536' />
+#. <point lat='48.0897202' lon='-4.9693825' /><point lat='48.0779844' lon='-4.6357600' /><point lat='48.1146852' lon='-4.6014717' />
+#. <point lat='48.1096154' lon='-4.3850007' /><point lat='48.1454286' lon='-4.3895513' /><point lat='48.1500888' lon='-4.3092543' />
+#. <point lat='48.1769373' lon='-4.3126821' /><point lat='48.1846773' lon='-4.4636854' /><point lat='48.1453035' lon='-4.4974841' />
+#. <point lat='48.1475763' lon='-4.5921009' /><point lat='48.2248800' lon='-4.5753669' /><point lat='48.2330974' lon='-4.6710089' />
+#. <point lat='48.3104921' lon='-4.6543410' /><point lat='48.3004956' lon='-4.8424298' /><point lat='48.4492607' lon='-5.1986731' />
+#. <point lat='48.5172155' lon='-5.1034610' /><point lat='48.3941286' lon='-4.8146500' /><point lat='48.5431896' lon='-4.8351542' />
+#. <point lat='48.6637334' lon='-4.6338697' /><point lat='48.7797813' lon='-3.9669223' /><point lat='48.7471474' lon='-3.9493945' />
+#. <point lat='48.7535602' lon='-3.6501973' /><point lat='48.8252653' lon='-3.6585313' /><point lat='48.8583372' lon='-3.5393140' />
+#. <point lat='48.9029653' lon='-3.5444401' /><point lat='48.9186584' lon='-3.4095425' /><point lat='48.8736644' lon='-3.4075537' />
+#. <point lat='48.9275037' lon='-3.0276871' /><point lat='48.5884071' lon='-2.6786137' /><point lat='48.7190877' lon='-2.2847486' />
+#. <point lat='48.6501630' lon='-2.1754283' /><point lat='48.7322121' lon='-2.0136968' /><point lat='48.7317759' lon='-1.8095282' />
+#. <point lat='48.6612609' lon='-1.8039194' /><point lat='48.6858177' lon='-1.6116146' /><point lat='49.2478104' lon='-1.7164548' />
+#. <point lat='49.3272144' lon='-1.8026014' /><point lat='49.3253007' lon='-1.8574757' /><point lat='49.6557284' lon='-1.9262013' />
+#. <point lat='49.6787215' lon='-2.0390800' /><point lat='49.7608677' lon='-2.0044546' /><point lat='49.6849834' lon='-1.6175855' />
+#. <point lat='49.7606702' lon='-1.2837344' /><point lat='49.6350423' lon='-1.1492009' /><point lat='49.5541159' lon='-1.1713375' />
+#. <point lat='49.5524476' lon='-1.2735291' /><point lat='49.3933982' lon='-1.1327984' /><point lat='49.4080413' lon='-0.9305950' />
+#. <point lat='49.3597647' lon='-0.7482671' /><point lat='49.3416700' lon='-0.3893456' /><point lat='49.2999494' lon='-0.2470445' />
+#. <point lat='49.2935335' lon='-0.1245368' /><point lat='49.3761879' lon='0.0273095' /><point lat='49.5465556' lon='0.0180063' />
+#. <point lat='49.6929183' lon='0.1221093' /><point lat='49.8646551' lon='0.5171306' /><point lat='49.9490353' lon='1.0572680' />
+#. <point lat='50.1181936' lon='1.4390814' /><point lat='50.4643666' lon='1.5317687' /><point lat='50.8586668' lon='1.5254895' />
+#. <point lat='50.9591925' lon='1.6411818' /><point lat='51.1214375' lon='2.4521050' /><point lat='51.1212359' lon='2.5928557' />
+#. <point lat='51.0577932' lon='2.6068264' /><point lat='50.8990562' lon='1.7975971' /><point lat='50.8237878' lon='1.6645759' />
+#. <point lat='50.1282048' lon='1.7078633' /><point lat='49.8500000' lon='1.0593618' /><point lat='49.7906207' lon='0.6160689' />
+#. <point lat='49.6502699' lon='0.2473107' /><point lat='49.5317374' lon='0.1709048' /><point lat='49.4962230' lon='0.5706464' />
+#. <point lat='49.3395965' lon='0.4111492' /><point lat='49.3573571' lon='0.1950421' /><point lat='49.2547917' lon='0.0171786' />
+#. <point lat='49.2631234' lon='-0.2445265' /><point lat='49.3049516' lon='-0.3840751' /><point lat='49.3243829' lon='-0.7409079' />
+#. <point lat='49.3713264' lon='-0.9954050' /><point lat='49.2517481' lon='-1.0545337' /><point lat='49.2902182' lon='-1.2770400' />
+#. <point lat='49.4346254' lon='-1.2596644' /><point lat='49.5398482' lon='-1.3914123' /><point lat='49.6205575' lon='-1.2753453' />
+#. <point lat='49.6594602' lon='-1.2977482' /><point lat='49.5713903' lon='-1.4904980' /><point lat='49.6339843' lon='-1.7751700' />
+#. <point lat='49.4815523' lon='-1.7460051' /><point lat='49.2469097' lon='-1.5129407' /><point lat='48.7260698' lon='-1.4826149' />
+#. <point lat='48.7253120' lon='-1.3057444' /><point lat='48.5973085' lon='-1.2832340' /><point lat='48.4347142' lon='-2.7611439' />
+#. <point lat='48.6764625' lon='-3.0017371' /><point lat='48.7209691' lon='-3.2106150' /><point lat='48.5605102' lon='-3.9540369' />
+#. <point lat='48.6079181' lon='-4.1564328' /><point lat='48.5585184' lon='-4.4447478' /><point lat='48.4829910' lon='-4.6368255' />
+#. <point lat='48.4472691' lon='-4.6318979' /><point lat='48.4308800' lon='-4.2502228' /><point lat='48.2180466' lon='-4.0614098' />
+#. <point lat='48.0516486' lon='-4.1757039' /><point lat='48.0140984' lon='-4.3190366' /><point lat='47.8997734' lon='-4.2678092' />
+#. <point lat='47.9817224' lon='-3.8848444' /><point lat='47.8640348' lon='-3.7637481' /><point lat='47.5263402' lon='-2.3272701' />
+#. <point lat='47.3338959' lon='-2.3691075' /><point lat='47.3350685' lon='-1.7406713' /><point lat='47.2045060' lon='-1.7706224' />
+#. <point lat='47.2194206' lon='-2.0367815' /><point lat='47.1554772' lon='-2.0968030' /><point lat='47.0123909' lon='-1.8878613' />
+#. <point lat='46.8300739' lon='-2.0879728' /><point lat='46.8343598' lon='-2.0121404' /><point lat='46.6965096' lon='-1.8407867' />
+#. <point lat='46.6548360' lon='-1.8731840' /><point lat='46.5039205' lon='-1.6885850' /><point lat='46.5151306' lon='-1.6211652' />
+#. <point lat='46.4167482' lon='-1.4242755' /><point lat='46.3591735' lon='-1.0176087' />
+#. </shape>
+#. </bounds>
+#. <attribution-text mandatory='true'>Ortho littorale 2000</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/G%C3%A9oLittoral</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#. <entry>
+#. <name>Géolittoral - Sentiers</name>
+#: build/trans_wms.java:760
+msgid "Géolittoral - Sentiers"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/png&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Sentiers_littoraux&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <attribution-text mandatory='true'>Ortho littorale 2000</attribution-text>
+#. <attribution-url>http://wiki.openstreetmap.org/wiki/WikiProject_France/G%C3%A9oLittoral</attribution-url>
+#. <country-code>FR</country-code>
+#. </entry>
+#.
 #. <!--only for Spain-->
-#. <!--false;PNOA Spain;http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS-->
+#.
 #. <entry>
 #. <name>PNOA Spain</name>
-#: build/trans_wms.java:311
+#: build/trans_wms.java:771
 msgid "PNOA Spain"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&]]></url>
-#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS]]></eula>
+#. <url><![CDATA[http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS={proj}&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Nacional&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>PNOA</attribution-text>
 #. <country-code>ES</country-code>
 #. </entry>
+#.
+#. <entry>
+#. <name>SIGPAC Spain</name>
+#: build/trans_wms.java:780
+msgid "SIGPAC Spain"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://wms.marm.es/wms/wms.aspx?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ORTOFOTOS&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='27.6302571' min-lon='-18.1661033' max-lat='43.8098190' max-lon='4.3987393'>
+#. <shape>
+#. <point lat='28.4460601' lon='-17.8846298'/><point lat='28.5225529' lon='-17.8939535'/><point lat='28.7481927' lon='-18.0212548'/>
+#. <point lat='28.8038375' lon='-18.0224091'/><point lat='28.8726124' lon='-17.9424017'/><point lat='28.8737099' lon='-17.8911792'/>
+#. <point lat='28.8515102' lon='-17.8903302'/><point lat='28.8537764' lon='-17.7675902'/><point lat='28.8312183' lon='-17.7669837'/>
+#. <point lat='28.8319975' lon='-17.7412714'/><point lat='28.7642235' lon='-17.7394926'/><point lat='28.7649677' lon='-17.7139824'/>
+#. <point lat='28.7303731' lon='-17.7129312'/><point lat='28.6931782' lon='-17.7574427'/><point lat='28.6741254' lon='-17.7570788'/>
+#. <point lat='28.6743524' lon='-17.7457913'/><point lat='28.6165627' lon='-17.7457266'/><point lat='28.5833675' lon='-17.7519687'/>
+#. <point lat='28.5591958' lon='-17.7622536'/><point lat='28.5416670' lon='-17.7833086'/><point lat='28.4936643' lon='-17.7831575'/>
+#. <point lat='28.4925024' lon='-17.8086110'/><point lat='28.4468974' lon='-17.8060072'/><point lat='28.4460601' lon='-17.8846298'/>
+#. </shape>
+#. <shape>
+#. <point lat='27.7851643' lon='-18.1661033'/><point lat='27.6949247' lon='-18.1634940'/><point lat='27.6963366' lon='-18.0889827'/>
+#. <point lat='27.6738724' lon='-18.0873398'/><point lat='27.6753701' lon='-18.0364092'/><point lat='27.6302571' lon='-18.0350079'/>
+#. <point lat='27.6323976' lon='-17.9589987'/><point lat='27.7926025' lon='-17.8603269'/><point lat='27.8368793' lon='-17.8630328'/>
+#. <point lat='27.8364947' lon='-17.8884015'/><point lat='27.8590536' lon='-17.8891263'/><point lat='27.8567467' lon='-17.9906491'/>
+#. <point lat='27.7655831' lon='-18.0386803'/><point lat='27.7637873' lon='-18.1146412'/><point lat='27.7863613' lon='-18.1154627'/>
+#. <point lat='27.7851643' lon='-18.1661033'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.0639801' lon='-17.3603800'/><point lat='28.1757247' lon='-17.3629657'/><point lat='28.1763688' lon='-17.3375583'/>
+#. <point lat='28.2213012' lon='-17.3384577'/><point lat='28.2238767' lon='-17.1857883'/><point lat='28.1351849' lon='-17.0820788'/>
+#. <point lat='28.0679977' lon='-17.0808422'/><point lat='28.0668073' lon='-17.1315446'/><point lat='28.0214628' lon='-17.1563337'/>
+#. <point lat='28.0203711' lon='-17.2321063'/><point lat='27.9980388' lon='-17.2319938'/><point lat='27.9978403' lon='-17.2576823'/>
+#. <point lat='28.0199741' lon='-17.2578510'/><point lat='28.0192298' lon='-17.3086658'/><point lat='28.0639801' lon='-17.3603800'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.3275779' lon='-16.9278171'/><point lat='28.3721879' lon='-16.9286591'/><point lat='28.3729288' lon='-16.8776666'/>
+#. <point lat='28.3954191' lon='-16.8780707'/><point lat='28.4226146' lon='-16.5214259'/><point lat='28.4911350' lon='-16.4457117'/>
+#. <point lat='28.5359720' lon='-16.4462506'/><point lat='28.5362679' lon='-16.4205859'/><point lat='28.5588419' lon='-16.4209227'/>
+#. <point lat='28.5597589' lon='-16.3443329'/><point lat='28.5822095' lon='-16.3446023'/><point lat='28.5837179' lon='-16.1912541'/>
+#. <point lat='28.6068435' lon='-16.1916246'/><point lat='28.6078193' lon='-16.1279344'/><point lat='28.5921762' lon='-16.1277997'/>
+#. <point lat='28.5925015' lon='-16.0995079'/><point lat='28.5163822' lon='-16.0993395'/><point lat='28.5161158' lon='-16.1648148'/>
+#. <point lat='28.4938583' lon='-16.1647474'/><point lat='28.4484704' lon='-16.2385755'/><point lat='28.4476116' lon='-16.2653516'/>
+#. <point lat='28.4030038' lon='-16.2658569'/><point lat='28.4017594' lon='-16.3167484'/><point lat='28.3801890' lon='-16.3163105'/>
+#. <point lat='28.3795075' lon='-16.3420763'/><point lat='28.2892963' lon='-16.3408301'/><point lat='28.1976134' lon='-16.4158370'/>
+#. <point lat='28.1311312' lon='-16.4150960'/><point lat='28.0164796' lon='-16.5153297'/><point lat='28.0153200' lon='-16.6168433'/>
+#. <point lat='27.9930469' lon='-16.6168096'/><point lat='27.9919168' lon='-16.7184243'/><point lat='28.0371426' lon='-16.7190979'/>
+#. <point lat='28.0367859' lon='-16.7446952'/><point lat='28.0818146' lon='-16.7453351'/><point lat='28.0816065' lon='-16.7706967'/>
+#. <point lat='28.1259036' lon='-16.8223966'/><point lat='28.1708652' lon='-16.8231712'/><point lat='28.1707464' lon='-16.8487012'/>
+#. <point lat='28.2607910' lon='-16.8502842'/><point lat='28.2605537' lon='-16.8756457'/><point lat='28.2832162' lon='-16.8760836'/>
+#. <point lat='28.2827713' lon='-16.9015125'/><point lat='28.3279337' lon='-16.9023882'/><point lat='28.3275779' lon='-16.9278171'/>
+#. </shape>
+#. <shape>
+#. <point lat='27.9008901' lon='-15.8537427'/><point lat='27.9901812' lon='-15.8542032'/><point lat='27.9906555' lon='-15.8289530'/>
+#. <point lat='28.0355780' lon='-15.8291065'/><point lat='28.0363232' lon='-15.7782992'/><point lat='28.0814298' lon='-15.7532793'/>
+#. <point lat='28.0815652' lon='-15.7278756'/><point lat='28.1718567' lon='-15.7282593'/><point lat='28.1728039' lon='-15.4989741'/>
+#. <point lat='28.1504075' lon='-15.4987438'/><point lat='28.1507459' lon='-15.4497785'/><point lat='28.1961425' lon='-15.4501622'/>
+#. <point lat='28.1961425' lon='-15.3972827'/><point lat='28.0383554' lon='-15.3964385'/><point lat='28.0380167' lon='-15.3710348'/>
+#. <point lat='28.0153212' lon='-15.3706511'/><point lat='28.0153212' lon='-15.3457847'/><point lat='27.9254406' lon='-15.3454777'/>
+#. <point lat='27.9252372' lon='-15.3708046'/><point lat='27.8352137' lon='-15.3705743'/><point lat='27.8347387' lon='-15.3959780'/>
+#. <point lat='27.7879673' lon='-15.4209979'/><point lat='27.7893932' lon='-15.4718052'/><point lat='27.7666454' lon='-15.4718820'/>
+#. <point lat='27.7667813' lon='-15.5227660'/><point lat='27.7216112' lon='-15.5477092'/><point lat='27.7213395' lon='-15.6236132'/>
+#. <point lat='27.7419910' lon='-15.6241504'/><point lat='27.7433495' lon='-15.7007451'/><point lat='27.8110501' lon='-15.8016690'/>
+#. <point lat='27.9008901' lon='-15.8537427'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.0467778' lon='-14.5215621'/><point lat='28.1184131' lon='-14.5224358'/><point lat='28.1156076' lon='-14.4157526'/>
+#. <point lat='28.2278805' lon='-14.2168794'/><point lat='28.3390300' lon='-14.2153651'/><point lat='28.4528287' lon='-14.1641672'/>
+#. <point lat='28.4747955' lon='-14.1115132'/><point lat='28.7226671' lon='-14.0335806'/><point lat='28.7449351' lon='-13.9565217'/>
+#. <point lat='28.7665857' lon='-13.9561722'/><point lat='28.7664325' lon='-13.8290221'/><point lat='28.7879765' lon='-13.8289639'/>
+#. <point lat='28.7879255' lon='-13.8000741'/><point lat='28.7189894' lon='-13.8012972'/><point lat='28.7193470' lon='-13.8275660'/>
+#. <point lat='28.6517968' lon='-13.8278572'/><point lat='28.6518990' lon='-13.8025786'/><point lat='28.5384172' lon='-13.8033941'/>
+#. <point lat='28.5384684' lon='-13.8288474'/><point lat='28.3970177' lon='-13.8315061'/><point lat='28.2241438' lon='-13.9158189'/>
+#. <point lat='28.2235696' lon='-13.9856445'/><point lat='28.1795787' lon='-14.0369588'/><point lat='28.1799894' lon='-14.1387139'/>
+#. <point lat='28.1579103' lon='-14.1386556'/><point lat='28.1578076' lon='-14.2153651'/><point lat='28.1118888' lon='-14.2147244'/>
+#. <point lat='28.0452356' lon='-14.2913173'/><point lat='28.0368713' lon='-14.3319673'/><point lat='28.0469834' lon='-14.4457846'/>
+#. <point lat='28.0657961' lon='-14.4466583'/><point lat='28.0682631' lon='-14.4962835'/><point lat='28.0458525' lon='-14.4959340'/>
+#. <point lat='28.0467778' lon='-14.5215621'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.8456579' lon='-13.8006620'/><point lat='28.8231121' lon='-13.8009273'/><point lat='28.8230539' lon='-13.7756880'/>
+#. <point lat='28.8898184' lon='-13.6972900'/><point lat='28.9127744' lon='-13.6972900'/><point lat='28.9117991' lon='-13.6072498'/>
+#. <point lat='29.0002417' lon='-13.4388551'/><point lat='29.1351289' lon='-13.4374559'/><point lat='29.1349931' lon='-13.4117005'/>
+#. <point lat='29.2229789' lon='-13.4105556'/><point lat='29.2555860' lon='-13.4592801'/><point lat='29.2942023' lon='-13.4597392'/>
+#. <point lat='29.2945638' lon='-13.5091254'/><point lat='29.3163453' lon='-13.5100581'/><point lat='29.3172941' lon='-13.5635382'/>
+#. <point lat='29.2713764' lon='-13.5640564'/><point lat='29.2711956' lon='-13.5389228'/><point lat='29.2500375' lon='-13.5389747'/>
+#. <point lat='29.2501279' lon='-13.5661293'/><point lat='29.2030039' lon='-13.5665956'/><point lat='29.2022349' lon='-13.5156549'/>
+#. <point lat='29.1820579' lon='-13.5156549'/><point lat='29.1827819' lon='-13.5398038'/><point lat='29.1375280' lon='-13.5408921'/>
+#. <point lat='29.1368528' lon='-13.6578200'/><point lat='29.0935079' lon='-13.7132220'/><point lat='29.0934533' lon='-13.7663353'/>
+#. <point lat='29.0165937' lon='-13.8502463'/><point lat='28.9834250' lon='-13.8518224'/><point lat='28.9148610' lon='-13.8524443'/>
+#. <point lat='28.8924500' lon='-13.9013122'/><point lat='28.8469779' lon='-13.9024005'/><point lat='28.8456579' lon='-13.8006620'/>
+#. </shape>
+#. <shape>
+#. <point lat='38.9990693' lon='1.6479916'/><point lat='38.9993635' lon='1.7321668'/><point lat='39.0441733' lon='1.7314703'/>
+#. <point lat='39.0431944' lon='1.6489512'/><point lat='39.1276358' lon='1.6481552'/><point lat='39.1265691' lon='1.3948608'/>
+#. <point lat='39.0864199' lon='1.3954412'/><point lat='39.0852615' lon='1.2281145'/><point lat='39.0028958' lon='1.2291095'/>
+#. <point lat='39.0018003' lon='1.1448657'/><point lat='38.8319988' lon='1.1452803'/><point lat='38.8331615' lon='1.3113632'/>
+#. <point lat='38.7906483' lon='1.3121924'/><point lat='38.7916178' lon='1.3946949'/><point lat='38.7529597' lon='1.3951924'/>
+#. <point lat='38.7519251' lon='1.3112803'/><point lat='38.6238804' lon='1.3125919'/><point lat='38.6251112' lon='1.6489036'/>
+#. <point lat='38.7111504' lon='1.6480745'/><point lat='38.7101152' lon='1.5845600'/><point lat='38.7005387' lon='1.5811604'/>
+#. <point lat='38.7002798' lon='1.5491544'/><point lat='38.7092094' lon='1.5197188'/><point lat='38.7253185' lon='1.5035500'/>
+#. <point lat='38.9155064' lon='1.4813282'/><point lat='38.9254411' lon='1.5518906'/><point lat='38.9566554' lon='1.5667328'/>
+#. <point lat='38.9583318' lon='1.6487378'/><point lat='38.9990693' lon='1.6479916'/>
+#. </shape>
+#. <shape>
+#. <point lat='39.4166673' lon='2.5450749'/><point lat='39.4161122' lon='2.4393300'/><point lat='39.4846853' lon='2.4387140'/>
+#. <point lat='39.4993424' lon='2.4390220'/><point lat='39.4993424' lon='2.3122308'/><point lat='39.5417911' lon='2.3119228'/>
+#. <point lat='39.5409994' lon='2.2290722'/><point lat='39.6260571' lon='2.2283536'/><point lat='39.6270851' lon='2.3460076'/>
+#. <point lat='39.9601558' lon='2.9270445'/><point lat='39.9600498' lon='3.1456647'/><point lat='40.0019797' lon='3.1460753'/>
+#. <point lat='40.0019797' lon='3.2313899'/><point lat='39.8329231' lon='3.2312872'/><point lat='39.8331596' lon='3.1482313'/>
+#. <point lat='39.7935717' lon='3.1484366'/><point lat='39.7931773' lon='3.4814817'/><point lat='39.5959027' lon='3.4803472'/>
+#. <point lat='39.4784606' lon='3.3150618'/><point lat='39.3785504' lon='3.3146179'/><point lat='39.2499355' lon='3.0830178'/>
+#. <point lat='39.2501482' lon='2.9798608'/><point lat='39.3334971' lon='2.9790395'/><point lat='39.3334177' lon='2.7287424'/>
+#. <point lat='39.4581361' lon='2.7288451'/><point lat='39.4577397' lon='2.6456865'/><point lat='39.4996593' lon='2.6453785'/>
+#. <point lat='39.4994216' lon='2.5452802'/><point lat='39.4166673' lon='2.5450749'/>
+#. </shape>
+#. <shape>
+#. <point lat='40.0434431' lon='3.8120402'/><point lat='40.0437979' lon='3.7290820'/><point lat='39.9584155' lon='3.7286185'/>
+#. <point lat='39.9576011' lon='3.8126633'/><point lat='39.9164393' lon='3.8122771'/><point lat='39.9159813' lon='3.9608975'/>
+#. <point lat='39.7913080' lon='4.1938142'/><point lat='39.7905799' lon='4.3150279'/><point lat='39.8329294' lon='4.3159934'/>
+#. <point lat='39.8320396' lon='4.3987393'/><point lat='39.9185834' lon='4.3973664'/><point lat='39.9193274' lon='4.3158003'/>
+#. <point lat='40.0433985' lon='4.3161865'/><point lat='40.0443594' lon='4.2318959'/><point lat='40.0847793' lon='4.2324752'/>
+#. <point lat='40.0861090' lon='4.1491501'/><point lat='40.1255157' lon='4.1490623'/><point lat='40.1272166' lon='4.0627981'/>
+#. <point lat='40.0849941' lon='4.0624217'/><point lat='40.0852940' lon='3.8128687'/><point lat='40.0434431' lon='3.8120402'/>
+#. </shape>
+#. <shape>
+#. <point lat='41.8228891' lon='-8.8910646'/><point lat='42.5751065' lon='-9.1092038'/><point lat='42.7306560' lon='-9.0365469'/>
+#. <point lat='42.7269569' lon='-9.0883419'/><point lat='42.7750272' lon='-9.1466113'/><point lat='42.9016271' lon='-9.2185488'/>
+#. <point lat='42.8605106' lon='-9.2760988'/><point lat='42.9311297' lon='-9.3099094'/><point lat='42.9821991' lon='-9.2789763'/>
+#. <point lat='43.0600377' lon='-9.3099094'/><point lat='43.1041725' lon='-9.2523594'/><point lat='43.1703151' lon='-9.2314975'/>
+#. <point lat='43.2101760' lon='-9.1473307'/><point lat='43.1991644' lon='-9.0674800'/><point lat='43.2426748' lon='-9.0336694'/>
+#. <point lat='43.2447709' lon='-8.9984200'/><point lat='43.2955793' lon='-8.9998588'/><point lat='43.3055265' lon='-8.9372732'/>
+#. <point lat='43.3269860' lon='-8.9293600'/><point lat='43.3290792' lon='-8.8638969'/><point lat='43.3740655' lon='-8.8761263'/>
+#. <point lat='43.3735426' lon='-8.8221732'/><point lat='43.3191358' lon='-8.7854850'/><point lat='43.3050030' lon='-8.7063538'/>
+#. <point lat='43.3296025' lon='-8.6099575'/><point lat='43.3233227' lon='-8.5509688'/><point lat='43.3364048' lon='-8.5243519'/>
+#. <point lat='43.3646525' lon='-8.5250713'/><point lat='43.3918416' lon='-8.4574500'/><point lat='43.4111803' lon='-8.3610538'/>
+#. <point lat='43.4634161' lon='-8.3603344'/><point lat='43.5797394' lon='-8.3344369'/><point lat='43.5708796' lon='-8.2776063'/>
+#. <point lat='43.7239184' lon='-8.0646713'/><point lat='43.7233986' lon='-7.9992081'/><point lat='43.7826357' lon='-7.9171994'/>
+#. <point lat='43.7914643' lon='-7.8560525'/><point lat='43.7374337' lon='-7.8359100'/><point lat='43.8098190' lon='-7.6628443'/>
+#. <point lat='43.6782695' lon='-7.3188932'/><point lat='43.5830817' lon='-7.1997467'/><point lat='43.6075032' lon='-6.2488228'/>
+#. <point lat='43.5790105' lon='-6.1229322'/><point lat='43.6798953' lon='-5.8520425'/><point lat='43.5708672' lon='-5.6036334'/>
+#. <point lat='43.5619084' lon='-5.2855347'/><point lat='43.4991591' lon='-5.1787525'/><point lat='43.4836655' lon='-4.9089869'/>
+#. <point lat='43.4192021' lon='-4.6156167'/><point lat='43.4249168' lon='-4.1839917'/><point lat='43.5195394' lon='-3.8029478'/>
+#. <point lat='43.4869277' lon='-3.7400025'/><point lat='43.5423572' lon='-3.5612827'/><point lat='43.3816347' lon='-3.1083013'/>
+#. <point lat='43.4624573' lon='-2.9385737'/><point lat='43.4755094' lon='-2.7452417'/><point lat='43.3170625' lon='-2.3046245'/>
+#. <point lat='43.3563045' lon='-1.9854018'/><point lat='43.3972545' lon='-1.8552841'/><point lat='43.3964383' lon='-1.7698020'/>
+#. <point lat='43.3760501' lon='-1.7700492'/><point lat='43.3756908' lon='-1.7100474'/><point lat='43.3312527' lon='-1.7113451'/>
+#. <point lat='43.3131806' lon='-1.7225915'/><point lat='43.3129108' lon='-1.6890375'/><point lat='43.3341294' lon='-1.6881106'/>
+#. <point lat='43.3337248' lon='-1.6446695'/><point lat='43.3133155' lon='-1.6449785'/><point lat='43.3129528' lon='-1.6029903'/>
+#. <point lat='43.2926624' lon='-1.6034352'/><point lat='43.2921227' lon='-1.5635905'/><point lat='43.3133844' lon='-1.5630468'/>
+#. <point lat='43.3128355' lon='-1.4779905'/><point lat='43.2761368' lon='-1.3667723'/><point lat='43.2381533' lon='-1.3568809'/>
+#. <point lat='43.1712972' lon='-1.3703692'/><point lat='43.0833554' lon='-1.4423067'/><point lat='43.0603647' lon='-1.4198262'/>
+#. <point lat='43.0511660' lon='-1.3730668'/><point lat='43.1115893' lon='-1.3640746'/><point lat='43.1352170' lon='-1.3020285'/>
+#. <point lat='43.1332484' lon='-1.2354864'/><point lat='43.0774443' lon='-1.2795481'/><point lat='43.0649635' lon='-1.1923239'/>
+#. <point lat='43.0077821' lon='-1.0061856'/><point lat='42.9748951' lon='-.9423410'/><point lat='42.9821318' lon='-.7562028'/>
+#. <point lat='42.9610774' lon='-.7148387'/><point lat='42.9031405' lon='-.6968543'/><point lat='42.8220693' lon='-.5511809'/>
+#. <point lat='42.8484456' lon='-.5044215'/><point lat='42.8200906' lon='-.4288871'/><point lat='42.8655842' lon='-.3164848'/>
+#. <point lat='42.8108560' lon='-.1456332'/><point lat='42.7124874' lon='-.0314324'/><point lat='42.7540985' lon='.1861785'/>
+#. <point lat='42.7177729' lon='.3021777'/><point lat='42.7428729' lon='.3642238'/><point lat='42.7144695' lon='.4487504'/>
+#. <point lat='42.7223973' lon='.6276949'/><point lat='42.8576747' lon='.6411832'/><point lat='42.8827180' lon='.7149192'/>
+#. <point lat='42.8181119' lon='.9675996'/><point lat='42.7989808' lon='1.1087770'/><point lat='42.7342872' lon='1.1753192'/>
+#. <point lat='42.7415521' lon='1.3632559'/><point lat='42.7093914' lon='1.4113736'/><point lat='42.7103407' lon='1.4806054'/>
+#. <point lat='42.5010664' lon='1.4813006'/><point lat='42.5020345' lon='1.6443591'/><point lat='42.5424539' lon='1.6432777'/>
+#. <point lat='42.5434214' lon='1.7304070'/><point lat='42.5011803' lon='1.7316429'/><point lat='42.5016359' lon='2.0638621'/>
+#. <point lat='42.4590247' lon='2.0645572'/><point lat='42.4599364' lon='2.3969309'/><point lat='42.4178363' lon='2.3976786'/>
+#. <point lat='42.4179732' lon='2.4804823'/><point lat='42.3759441' lon='2.4809767'/><point lat='42.3762636' lon='2.6447922'/>
+#. <point lat='42.4592447' lon='2.6444832'/><point lat='42.4596094' lon='2.8113266'/><point lat='42.5010358' lon='2.8112648'/>
+#. <point lat='42.5008535' lon='3.0638780'/><point lat='42.4591535' lon='3.0638780'/><point lat='42.4593359' lon='3.2307832'/>
+#. <point lat='42.3764363' lon='3.2304935'/><point lat='42.3760369' lon='3.3141469'/><point lat='42.3339864' lon='3.3141243'/>
+#. <point lat='42.3340435' lon='3.3978550'/><point lat='42.2900940' lon='3.3973912'/><point lat='42.2908368' lon='3.3138923'/>
+#. <point lat='42.2070151' lon='3.3139695'/><point lat='42.2073012' lon='3.1475896'/><point lat='42.1260612' lon='3.1475896'/>
+#. <point lat='42.1260039' lon='3.2305478'/><point lat='41.9529359' lon='3.2466753'/><point lat='41.8558943' lon='3.1945206'/>
+#. <point lat='41.7647419' lon='3.0605370'/><point lat='41.6371796' lon='2.7835777'/><point lat='41.4271601' lon='2.2629300'/>
+#. <point lat='41.2989297' lon='2.1649151'/><point lat='41.2232228' lon='1.8600800'/><point lat='41.1162730' lon='1.3763003'/>
+#. <point lat='41.0464585' lon='1.1793714'/><point lat='41.0484930' lon='1.0858526'/><point lat='40.8195599' lon='.7585370'/>
+#. <point lat='40.7337610' lon='.9114042'/><point lat='40.6751363' lon='.8781331'/><point lat='40.5358666' lon='.6650182'/>
+#. <point lat='40.5502166' lon='.5580112'/><point lat='40.3757589' lon='.4339190'/><point lat='40.1919192' lon='.2675635'/>
+#. <point lat='40.0647234' lon='.1641534'/><point lat='40.0144671' lon='.0751307'/><point lat='39.8952188' lon='.0103870'/>
+#. <point lat='39.8116904' lon='-.0939224'/><point lat='39.6311716' lon='-.1847435'/><point lat='39.5036254' lon='-.2908513'/>
+#. <point lat='39.3334310' lon='-.2863552'/><point lat='39.1774612' lon='-.1856427'/><point lat='39.1558487' lon='-.2135185'/>
+#. <point lat='38.9722246' lon='-.1110076'/><point lat='38.8826835' lon='.0094878'/><point lat='38.8721830' lon='.1218901'/>
+#. <point lat='38.7986360' lon='.2342925'/><point lat='38.7264162' lon='.2558737'/><point lat='38.6133825' lon='.0958128'/>
+#. <point lat='38.6070586' lon='-.0022021'/><point lat='38.5269073' lon='-.0570544'/><point lat='38.4762395' lon='-.2719677'/>
+#. <point lat='38.3931234' lon='-.3798740'/><point lat='38.3381297' lon='-.3834708'/><point lat='38.3310763' lon='-.4509122'/>
+#. <point lat='38.2830943' lon='-.5048654'/><point lat='38.1948095' lon='-.4823849'/><point lat='38.1658287' lon='-.4293310'/>
+#. <point lat='38.1488590' lon='-.4545091'/><point lat='38.1721913' lon='-.5839966'/><point lat='38.1198599' lon='-.6136708'/>
+#. <point lat='37.9612228' lon='-.6370505'/><point lat='37.9456238' lon='-.6811123'/><point lat='37.8810656' lon='-.7323677'/>
+#. <point lat='37.7830562' lon='-.7215771'/><point lat='37.7340026' lon='-.6883060'/><point lat='37.6231485' lon='-.6641461'/>
+#. <point lat='37.5878413' lon='-.7193941'/><point lat='37.5375806' lon='-.9196258'/><point lat='37.5164093' lon='-1.1107098'/>
+#. <point lat='37.5286671' lon='-1.3383246'/><point lat='37.3903714' lon='-1.4408917'/><point lat='37.2765189' lon='-1.6766966'/>
+#. <point lat='36.9122889' lon='-1.8540816'/><point lat='36.6929117' lon='-2.0683486'/><point lat='36.6619233' lon='-2.2158766'/>
+#. <point lat='36.7801753' lon='-2.3721861'/><point lat='36.6591056' lon='-2.6812926'/><point lat='36.6675585' lon='-2.9201476'/>
+#. <point lat='36.7126250' lon='-3.0940200'/><point lat='36.6548788' lon='-3.4610839'/><point lat='36.6929117' lon='-3.7280395'/>
+#. <point lat='36.6633322' lon='-4.3743529'/><point lat='36.4404171' lon='-4.6571151'/><point lat='36.4531321' lon='-4.9188018'/>
+#. <point lat='36.3513541' lon='-5.1699508'/><point lat='36.1970201' lon='-5.2841094'/><point lat='36.1241812' lon='-5.2680911'/>
+#. <point lat='36.1224654' lon='-5.3524784'/><point lat='36.0401413' lon='-5.3516094'/><point lat='36.0388921' lon='-5.4365759'/>
+#. <point lat='36.0034384' lon='-5.4353207'/><point lat='36.0036518' lon='-5.6888562'/><point lat='36.0405317' lon='-5.6899635'/>
+#. <point lat='36.0385595' lon='-5.8550600'/><point lat='36.1242077' lon='-5.8566821'/><point lat='36.1221487' lon='-5.9384817'/>
+#. <point lat='36.1655625' lon='-5.9400265'/><point lat='36.1645024' lon='-5.9983445'/><point lat='36.1780957' lon='-6.0357297'/>
+#. <point lat='36.2224132' lon='-6.0775178'/><point lat='36.2864561' lon='-6.1506113'/><point lat='36.3770075' lon='-6.2315410'/>
+#. <point lat='36.5310643' lon='-6.3358504'/><point lat='36.5816265' lon='-6.3214629'/><point lat='36.6234958' lon='-6.4041910'/>
+#. <point lat='36.7489673' lon='-6.4743301'/><point lat='36.7993866' lon='-6.4158808'/><point lat='36.9173818' lon='-6.4905160'/>
+#. <point lat='37.0194012' lon='-6.6298949'/><point lat='37.1083766' lon='-6.8744824'/><point lat='37.1850699' lon='-7.0426363'/>
+#. <point lat='37.1843535' lon='-7.2647434'/><point lat='37.1535419' lon='-7.3753473'/><point lat='37.1682196' lon='-7.4083160'/>
+#. <point lat='37.2118318' lon='-7.4202886'/><point lat='37.2350505' lon='-7.4249231'/><point lat='37.2451969' lon='-7.4380543'/>
+#. <point lat='37.3326142' lon='-7.4459717'/><point lat='37.3909382' lon='-7.4480958'/><point lat='37.4075829' lon='-7.4696271'/>
+#. <point lat='37.4530494' lon='-7.4647029'/><point lat='37.5164110' lon='-7.5019723'/><point lat='37.5229203' lon='-7.5191587'/>
+#. <point lat='37.5723727' lon='-7.5219588'/><point lat='37.6695835' lon='-7.4501271'/><point lat='37.7599222' lon='-7.4249019'/>
+#. <point lat='37.8399740' lon='-7.3166620'/><point lat='37.9889520' lon='-7.2683290'/><point lat='38.0155235' lon='-7.1536786'/>
+#. <point lat='38.0553626' lon='-7.1177098'/><point lat='38.0243785' lon='-7.0142997'/><point lat='38.1075633' lon='-6.9963153'/>
+#. <point lat='38.2012540' lon='-6.9614706'/><point lat='38.1570753' lon='-7.0806170'/><point lat='38.4402363' lon='-7.3402665'/>
+#. <point lat='38.7380741' lon='-7.2638329'/><point lat='38.8729667' lon='-7.0435243'/><point lat='38.9079620' lon='-7.0615086'/>
+#. <point lat='39.0198308' lon='-6.9693387'/><point lat='39.0887867' lon='-7.0008114'/><point lat='39.0957658' lon='-7.1536786'/>
+#. <point lat='39.1602899' lon='-7.1525545'/><point lat='39.1968854' lon='-7.2447245'/><point lat='39.2813308' lon='-7.2559647'/>
+#. <point lat='39.3535074' lon='-7.3368944'/><point lat='39.4559917' lon='-7.3279022'/><point lat='39.5886496' lon='-7.5144901'/>
+#. <point lat='39.6795427' lon='-7.5527069'/><point lat='39.6752171' lon='-7.0502684'/><point lat='39.8195433' lon='-6.9951913'/>
+#. <point lat='39.8790868' lon='-6.9221297'/><point lat='40.0229854' lon='-6.8861610'/><point lat='40.1347927' lon='-7.0412762'/>
+#. <point lat='40.2661460' lon='-7.0176717'/><point lat='40.3450071' lon='-6.8086034'/><point lat='40.4451649' lon='-6.8681766'/>
+#. <point lat='40.6066433' lon='-6.8535643'/><point lat='40.8757589' lon='-6.8378280'/><point lat='41.0370445' lon='-6.9536024'/>
+#. <point lat='41.0395879' lon='-6.8018592'/><point lat='41.1387060' lon='-6.7681385'/><point lat='41.2655616' lon='-6.6411239'/>
+#. <point lat='41.2630269' lon='-6.5624422'/><point lat='41.5791017' lon='-6.2173670'/><point lat='41.6446520' lon='-6.3162811'/>
+#. <point lat='41.6412921' lon='-6.5152332'/><point lat='41.6883151' lon='-6.5871707'/><point lat='41.8559743' lon='-6.5478299'/>
+#. <point lat='41.9112057' lon='-6.6298836'/><point lat='41.9404756' lon='-7.1334461'/><point lat='41.8718791' lon='-7.1682909'/>
+#. <point lat='41.7847727' lon='-7.4256922'/><point lat='41.8459271' lon='-7.9539833'/><point lat='41.7805819' lon='-8.1304550'/>
+#. <point lat='41.9078597' lon='-8.2518495'/><point lat='42.0348842' lon='-8.1293309'/><point lat='42.1008034' lon='-8.2484774'/>
+#. <point lat='42.0557521' lon='-8.3676239'/><point lat='42.0340493' lon='-8.6070409'/><point lat='41.8228891' lon='-8.8910646'/>
+#. </shape>
+#. </bounds>
+#. <attribution-text mandatory='true'>SIGPAC</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>GRAFCAN - Canary Islands</name>
+#: build/trans_wms.java:1007
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://idecan1.grafcan.es/ServicioWMS/OrtoUrb?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=OU&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lat='27.6221843' min-lon='-18.1779014' max-lat='29.4280698' max-lon='-13.3261713'>
+#. <shape>
+#. <point lat='28.8910589' lon='-17.9291733'/><point lat='28.7998146' lon='-18.0333424'/><point lat='28.7317767' lon='-18.0374275'/>
+#. <point lat='28.4322434' lon='-17.8781100'/><point lat='28.4178731' lon='-17.8311317'/><point lat='28.5632821' lon='-17.7269626'/>
+#. <point lat='28.6798232' lon='-17.7310476'/><point lat='28.7371497' lon='-17.6840694'/><point lat='28.8678081' lon='-17.7535155'/>
+#. <point lat='28.8606530' lon='-17.8576846'/><point lat='28.8910589' lon='-17.9291733'/>
+#. </shape>
+#. <shape>
+#. <point lat='27.7721138' lon='-18.0781762'/><point lat='27.7875098' lon='-18.1370743'/><point lat='27.7644149' lon='-18.1705392'/>
+#. <point lat='27.7069523' lon='-18.1779014'/><point lat='27.6879890' lon='-18.1578225'/><point lat='27.6790988' lon='-18.0580973'/>
+#. <point lat='27.6257423' lon='-18.0065614'/><point lat='27.6221843' lon='-17.9610492'/><point lat='27.7081374' lon='-17.9389624'/>
+#. <point lat='27.7193953' lon='-17.9075054'/><point lat='27.8046798' lon='-17.8619932'/><point lat='27.8407872' lon='-17.8727020'/>
+#. <point lat='27.8680077' lon='-17.9255764'/><point lat='27.8360525' lon='-18.0052228'/><point lat='27.8034958' lon='-18.0139237'/>
+#. <point lat='27.7721138' lon='-18.0781762'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.2399643' lon='-17.2687764'/><point lat='28.2193251' lon='-17.3340329'/><point lat='28.1536956' lon='-17.3633146'/>
+#. <point lat='28.0880258' lon='-17.3666611'/><point lat='28.0474233' lon='-17.3306864'/><point lat='28.0068054' lon='-17.2729595'/>
+#. <point lat='28.0053281' lon='-17.2001735'/><point lat='28.0289625' lon='-17.1441199'/><point lat='28.0835972' lon='-17.0780268'/>
+#. <point lat='28.1536956' lon='-17.0872296'/><point lat='28.2149019' lon='-17.1826044'/><point lat='28.2399643' lon='-17.2687764'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.3762297' lon='-16.9358012'/><point lat='28.3357366' lon='-16.9450040'/><point lat='27.9831662' lon='-16.7199529'/>
+#. <point lat='27.9831662' lon='-16.6254147'/><point lat='28.0164074' lon='-16.5275300'/><point lat='28.1463190' lon='-16.3995269'/>
+#. <point lat='28.3092236' lon='-16.3359437'/><point lat='28.3644515' lon='-16.3300873'/><point lat='28.5240820' lon='-16.1025263'/>
+#. <point lat='28.5814018' lon='-16.0983432'/><point lat='28.6254727' lon='-16.1426842'/><point lat='28.5960942' lon='-16.3392902'/>
+#. <point lat='28.5314325' lon='-16.4380115'/><point lat='28.4402508' lon='-16.5392427'/><point lat='28.4122923' lon='-16.8395897'/>
+#. <point lat='28.3762297' lon='-16.9358012'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.2058483' lon='-15.6883306'/><point lat='28.1643685' lon='-15.4739464'/><point lat='28.2104562' lon='-15.4242720'/>
+#. <point lat='28.1724353' lon='-15.3628326'/><point lat='28.0559841' lon='-15.3837481'/><point lat='27.9844367' lon='-15.3314593'/>
+#. <point lat='27.8042042' lon='-15.3576037'/><point lat='27.6977727' lon='-15.5915962'/><point lat='27.7336471' lon='-15.7000956'/>
+#. <point lat='27.8030479' lon='-15.7994443'/><point lat='27.9243925' lon='-15.8713415'/><point lat='28.0363710' lon='-15.8478115'/>
+#. <point lat='28.0894335' lon='-15.7471555'/><point lat='28.1839582' lon='-15.7314689'/><point lat='28.2058483' lon='-15.6883306'/>
+#. </shape>
+#. <shape>
+#. <point lat='28.1344754' lon='-14.5088179'/><point lat='28.1344754' lon='-14.4107763'/><point lat='28.2427804' lon='-14.2486810'/>
+#. <point lat='28.3463737' lon='-14.2382232'/><point lat='28.7391056' lon='-14.0395256'/><point lat='28.7826519' lon='-13.8944241'/>
+#. <point lat='28.7769232' lon='-13.7859248'/><point lat='28.3843326' lon='-13.8212198'/><point lat='28.1909460' lon='-13.9153397'/>
+#. <point lat='28.1356282' lon='-14.1859344'/><point lat='28.0052882' lon='-14.3088131'/><point lat='28.0514443' lon='-14.5401912'/>
+#. <point lat='28.1344754' lon='-14.5088179'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.3772716' lon='-13.5524989'/><point lat='29.3682409' lon='-13.5086799'/><point lat='29.3872775' lon='-13.4795521'/>
+#. <point lat='29.4096331' lon='-13.4754312'/><point lat='29.4280698' lon='-13.5003013'/><point lat='29.4071183' lon='-13.5504986'/>
+#. <point lat='29.3772716' lon='-13.5524989'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.1610205' lon='-13.3976004'/><point lat='29.1215664' lon='-13.4281427'/><point lat='28.9908417' lon='-13.4417378'/>
+#. <point lat='28.9194675' lon='-13.5389950'/><point lat='28.8846777' lon='-13.7084109'/><point lat='28.8086488' lon='-13.7711575'/>
+#. <point lat='28.8352194' lon='-13.9008338'/><point lat='28.8892559' lon='-13.9071084'/><point lat='28.9368580' lon='-13.8579569'/>
+#. <point lat='29.0365684' lon='-13.8569111'/><point lat='29.1498834' lon='-13.6759918'/><point lat='29.1571898' lon='-13.5672310'/>
+#. <point lat='29.3507259' lon='-13.5542776'/><point lat='29.2180634' lon='-13.3998790'/><point lat='29.1610205' lon='-13.3976004'/>
+#. </shape>
+#. <shape>
+#. <point lat='29.2866715' lon='-13.3379231'/><point lat='29.2743558' lon='-13.3503484'/><point lat='29.2653346' lon='-13.3385966'/>
+#. <point lat='29.2776514' lon='-13.3261713'/><point lat='29.2866715' lon='-13.3379231'/>
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Territorial&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>GRAFCAN OrtoExpress Urbana 2009</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>ITACyL - Castile and León</name>
+#: build/trans_wms.java:1076
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://orto.wms.itacyl.es/WMS?REQUEST=GetMap&SERVICE=WMS&VERSION=1.1.1&LAYERS=Ortofoto_CyL&SRS={proj}&FORMAT=image/jpeg&STYLES=Default&TRANSPARENT=TRUE&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Territorial&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>ITACyL</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
+#. <entry>
+#. <name>IDEIB - Balearic Islands</name>
+#: build/trans_wms.java:1085
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+#. <type>wms</type>
+#. <url><![CDATA[http://ideib.caib.es/pub_ideib/public/IMATGES_AERIES/MapServer/WMSServer?VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=8&STYLES=default&FORMAT=image/png&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <bounds min-lon='1.1446656' min-lat='38.6237676' max-lon='4.3994771' max-lat='40.1276332'>
+#. <shape>
+#. <point lat='38.6248050' lon='1.6489275' /><point lat='38.7110984' lon='1.6479536' /><point lat='38.7100391' lon='1.5655859' />
+#. <point lat='38.8362172' lon='1.5646120' /><point lat='38.8351598' lon='1.4822737' /><point lat='38.9155737' lon='1.4814474' />
+#. <point lat='38.9165381' lon='1.5655563' /><point lat='38.9571694' lon='1.5647300' /><point lat='38.9581103' lon='1.6488389' />
+#. <point lat='38.9989241' lon='1.6480421' /><point lat='38.9999103' lon='1.7320625' /><point lat='39.0444420' lon='1.7313247' />
+#. <point lat='39.0435195' lon='1.6488765' /><point lat='39.1278411' lon='1.6480797' /><point lat='39.1267422' lon='1.3946905' />
+#. <point lat='39.0863458' lon='1.3956349' /><point lat='39.0850859' lon='1.2279187' /><point lat='39.0030754' lon='1.2288926' />
+#. <point lat='39.0016764' lon='1.1446656' /><point lat='38.8318955' lon='1.1456690' /><point lat='38.8332288' lon='1.3113193' />
+#. <point lat='38.7903874' lon='1.3122342' /><point lat='38.7916296' lon='1.3946905' /><point lat='38.7528829' lon='1.3954873' />
+#. <point lat='38.7517321' lon='1.3112013' /><point lat='38.6237676' lon='1.3122637' />
+#. </shape>
+#. <shape>
+#. <point lat='40.0856962' lon='3.8127693' /><point lat='40.0852552' lon='4.0622084' /><point lat='40.1276331' lon='4.0629289' />
+#. <point lat='40.1266966' lon='4.1493175' /><point lat='40.0859719' lon='4.1483808' /><point lat='40.0850347' lon='4.2326079' />
+#. <point lat='40.0442299' lon='4.2318874' /><point lat='40.0434025' lon='4.3159704' /><point lat='39.9193480' lon='4.3152499' />
+#. <point lat='39.9185191' lon='4.3994770' /><point lat='39.8322597' lon='4.3984683' /><point lat='39.8330343' lon='4.3160425' />
+#. <point lat='39.7905288' lon='4.3152499' /><point lat='39.7914146' lon='4.1452827' /><point lat='39.8324810' lon='4.1458591' />
+#. <point lat='39.8333109' lon='4.0620643' /><point lat='39.8741865' lon='4.0626407' /><point lat='39.8750159' lon='3.9789900' />
+#. <point lat='39.9158666' lon='3.9794223' /><point lat='39.9165850' lon='3.8121929' /><point lat='39.9576871' lon='3.8127693' />
+#. <point lat='39.9583498' lon='3.7289745' /><point lat='40.0438990' lon='3.7291907' /><point lat='40.0435129' lon='3.8121209' />
+#. </shape>
+#. <shape>
+#. <point lat='39.2497788' lon='3.1482712' /><point lat='39.2914976' lon='3.1483893' /><point lat='39.2914519' lon='3.2316129' />
+#. <point lat='39.3330546' lon='3.2317604' /><point lat='39.3329633' lon='3.3149545' /><point lat='39.4997870' lon='3.3152201' />
+#. <point lat='39.4994682' lon='3.3983256' /><point lat='39.5414021' lon='3.3985617' /><point lat='39.5410834' lon='3.4817263' />
+#. <point lat='39.7933578' lon='3.4818738' /><point lat='39.7934938' lon='3.1482712' /><point lat='39.8330968' lon='3.1484483' />
+#. <point lat='39.8329835' lon='3.2316424' /><point lat='40.0017256' lon='3.2318194' /><point lat='40.0018386' lon='3.1459103' />
+#. <point lat='39.9601389' lon='3.1457627' /><point lat='39.9600484' lon='2.8958559' /><point lat='39.9185496' lon='2.8958854' />
+#. <point lat='39.9184364' lon='2.8124552' /><point lat='39.8768443' lon='2.8125733' /><point lat='39.8767085' lon='2.7290251' />
+#. <point lat='39.8352724' lon='2.7291726' /><point lat='39.8350458' lon='2.6456834' /><point lat='39.7936526' lon='2.6458310' />
+#. <point lat='39.7934031' lon='2.5622533' /><point lat='39.7104055' lon='2.5624303' /><point lat='39.7100876' lon='2.4787641' />
+#. <point lat='39.6688237' lon='2.4790887' /><point lat='39.6684830' lon='2.3953929' /><point lat='39.6272169' lon='2.3956585' />
+#. <point lat='39.6268532' lon='2.2286802' /><point lat='39.5410379' lon='2.2291819' /><point lat='39.5414703' lon='2.3120513' />
+#. <point lat='39.4993771' lon='2.3124055' /><point lat='39.4996731' lon='2.4390410' /><point lat='39.4160716' lon='2.4393067' />
+#. <point lat='39.4164820' lon='2.5453134' /><point lat='39.4997870' lon='2.5450478' /><point lat='39.4999236' lon='2.6455949' />
+#. <point lat='39.4579647' lon='2.6457129' /><point lat='39.4582381' lon='2.7289660' /><point lat='39.3330317' lon='2.7290841' />
+#. <point lat='39.3331687' lon='2.9791385' /><point lat='39.2498017' lon='2.9791680' />
+#. </shape>
+#. <shape>
+#. <point lat='39.0832200' lon='2.9816461' /><point lat='39.2100713' lon='2.9815989' />
+#. <point lat='39.2100164' lon='2.8958255' /><point lat='39.0831650' lon='2.8957783' />
+#. </shape>
+#. </bounds>
+#. <eula mandatory='true'><![CDATA[http://wiki.openstreetmap.org/w/index.php?title=Spain_Potential_Datasources/WMS_Territorial&printable=yes]]></eula>
+#. <attribution-text mandatory='true'>ideib.cat</attribution-text>
+#. <country-code>ES</country-code>
+#. </entry>
+#.
 #. <!--only for Estonia-->
-#. <!--false;Estonia Basemap (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&-->
+#.
 #. <entry>
 #. <name>Estonia Basemap (Maaamet)</name>
-#: build/trans_wms.java:320
+#: build/trans_wms.java:1140
 msgid "Estonia Basemap (Maaamet)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&]]></url>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>EE</country-code>
 #. </entry>
-#. <!--false;Estonia Ortho (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&-->
+#.
 #. <entry>
 #. <name>Estonia Ortho (Maaamet)</name>
-#: build/trans_wms.java:327
+#: build/trans_wms.java:1147
 msgid "Estonia Ortho (Maaamet)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&]]></url>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS={proj}&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>EE</country-code>
 #. </entry>
-#. <!--false;Estonia Multi (Maaamet);http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&-->
+#.
 #. <entry>
 #. <name>Estonia Multi (Maaamet)</name>
-#: build/trans_wms.java:334
+#: build/trans_wms.java:1154
 msgid "Estonia Multi (Maaamet)"
 msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&]]></url>
+#. <url><![CDATA[http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>EE</country-code>
 #. </entry>
+#.
 #. <!--only for Denmark-->
-#. <!--false;Fugro (Denmark);tms[19]:http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png;;54.46819,8.01887,57.8229,15.30992;Fugro Aerial Mapping;http://wiki.openstreetmap.org/wiki/Fugro;http://wiki.openstreetmap.org/wiki/Fugro#Agreement_2-->
+#.
 #. <entry>
 #. <name>Fugro (Denmark)</name>
-#: build/trans_wms.java:342
+#: build/trans_wms.java:1163
 msgid "Fugro (Denmark)"
 msgstr ""
 
 #. <type>tms</type>
-#. <url><![CDATA[http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png]]></url>
+#. <url>http://{switch:a,b,c}.tile.openstreetmap.dk/fugro2005/{zoom}/{x}/{y}.png</url>
+#. <max-zoom>19</max-zoom>
 #. <bounds min-lat='54.46819' min-lon='8.01887' max-lat='57.8229' max-lon='15.30992'/>
-#. <max-zoom>19</max-zoom>
 #. <attribution-text mandatory='true'>Fugro Aerial Mapping</attribution-text>
 #. <attribution-url>http://wiki.openstreetmap.org/wiki/Fugro</attribution-url>
@@ -36501,35 +37471,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 ""
@@ -36541,9 +37527,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 ""
@@ -38939,4 +39926,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
@@ -39522,18 +40526,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 ""
@@ -40203,16 +41207,15 @@
 msgstr "Mælingar"
 
-#: ../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 ""
@@ -40266,80 +41269,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
@@ -40347,35 +41384,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
@@ -40383,8 +41434,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
@@ -40394,11 +41453,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 ""
 
@@ -41785,4 +42875,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"
@@ -41958,4 +43056,24 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr ""
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr ""
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42016,9 +43134,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 ""
 
@@ -42703,9 +43816,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 ""
@@ -42800,17 +43913,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 ""
@@ -43531,4 +44644,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
@@ -43550,25 +44679,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 "Opna slóð (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 ""
 
@@ -43628,6 +44743,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 ""
 
@@ -43745,5 +44890,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 ""
@@ -43757,5 +44902,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 ""
@@ -43770,12 +44915,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 ""
 
@@ -44109,2 +45268,11 @@
 msgid "Drive a race car on this layer"
 msgstr ""
+
+#~ msgid "Info about Element"
+#~ msgstr "Upplýsingar um hlut"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum"
+
+#~ msgid "Object history"
+#~ msgstr "Breytingaskrá hluts"
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 26723)
+++ /applications/editors/josm/i18n/po/it.po	(revision 26724)
@@ -1,29 +1,11 @@
 # Josm italian translation
 # License: GPL
-#. <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 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 21:25+0200\n"
-"PO-Revision-Date: 2011-09-02 06:48+0000\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2011-09-27 19:09+0200\n"
+"PO-Revision-Date: 2011-09-27 08:39+0000\n"
+"Last-Translator: Davide Prade <davide.prade@gmail.com>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "Language: it\n"
@@ -32,6 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-09-02 19:19+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:57+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -41,6 +23,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
@@ -65,8 +47,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
@@ -78,7 +60,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
@@ -92,8 +74,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
@@ -105,5 +88,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
@@ -113,6 +95,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
@@ -126,10 +108,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
@@ -395,8 +378,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
@@ -410,6 +393,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
@@ -421,6 +404,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
@@ -435,6 +418,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
@@ -456,7 +439,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
@@ -473,5 +458,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 "Annulla"
@@ -482,4 +467,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 "Selezionare almeno un nodo, percorso o relazione già caricato."
@@ -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 "dati"
@@ -764,5 +753,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 "Chiudi i gruppi di modifiche aperti"
@@ -782,6 +771,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
@@ -863,9 +852,10 @@
 msgstr "Seleziona qualcosa da copiare."
 
-#: ../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 "Copia coordinate"
 
-#: ../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 "Copia le coordinate dei nodi selezionati negli appunti."
@@ -922,13 +912,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
@@ -940,5 +930,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
@@ -958,14 +948,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 "Sovrascrivi"
 
 #: ../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 "Il file esiste. Sovrascriverlo?"
@@ -1160,5 +1150,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}"
@@ -1234,13 +1224,29 @@
 msgstr "Esporta file GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Storico dell''oggetto"
-
-#: ../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 "Cronologia"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 "Visualizza le informazioni dello storico OSM su percorsi, nodi o relazioni."
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:20
+msgid "History (web)"
+msgstr "Storico (web)"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:18
+msgid ""
+"Display history information about OSM ways, nodes, or relations in web "
+"browser."
+msgstr ""
+"Visualizza le informazioni storiche sui percorsi, nodi o relazioni OSM nel "
+"browser web."
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:46
@@ -1285,5 +1291,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"
@@ -1316,13 +1322,27 @@
 msgstr "Il segnalibro per lo scostamento esiste già. Sovrascrivere?"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20
-msgid "Info about Element"
-msgstr "Informazioni riguardanti l''elemento"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
-"Visualizza le informazioni dell''oggetto OSM su nodi, percorsi o relazioni."
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:23
+msgid "Advanced info"
+msgstr "Informazioni avanzate"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:21
+msgid ""
+"Display advanced object information about OSM nodes, ways, or relations."
+msgstr ""
+"Visualizza le informazioni avanzate dei nodi, percorsi o relazioni OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:20
+msgid "Advanced info (web)"
+msgstr "Informazioni avanzate (web)"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:18
+msgid ""
+"Display object information about OSM nodes, ways, or relations in web "
+"browser."
+msgstr ""
+"Visualizza le informazioni avanzate dei nodi, percorsi o relazioni OSM nel "
+"browser web."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
@@ -1343,6 +1363,9 @@
 "Uno dei percorsi selezionati non è chiuso e quindi non può essere unito."
 
-#: ../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."
@@ -1354,21 +1377,24 @@
 "I percorsi selezionati hanno dei nodi esterni alla zona dei dati scaricati"
 
-#: ../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 "Ciò potrebbe portare alla cancellazione accidentale di nodi"
 
-#: ../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 "Sei realmente sicuro di proseguire?"
 
-#: ../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 "Si prega di annullare se non si è sicuri"
 
-#: ../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 ""
@@ -1378,33 +1404,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 "Annullamento modifiche"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr "Rimossi i nodi duplicati"
 
-#: ../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 "Nodo aggiunto su tutte le intersezioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr "Riunisci i nuovi poligoni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr "Elimina relazioni"
 
-#: ../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 "Elimina i percorsi che non fanno parte di un multi-poligono interno"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr "Le aree sovrapposte sono state unite"
 
-#: ../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 "
@@ -1414,13 +1440,13 @@
 "favore verifica che non siano stati introdotti errori."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "Correggi i conflitti di etichette"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr "Divide i percorsi in frammenti"
 
-#: ../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 ""
@@ -1428,5 +1454,5 @@
 "aventi più percorsi esterni."
 
-#: ../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."
@@ -1435,6 +1461,6 @@
 "relazioni di tipo multi-poligono."
 
+#: ../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 "
@@ -1444,5 +1470,5 @@
 "esterno in relazioni di tipo multi-poligono."
 
-#: ../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."
@@ -1451,14 +1477,14 @@
 "relazioni di tipo multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363
 msgid "Removed Element from Relations"
 msgstr "Sono stati rimossi elementi dalle Relazioni"
 
 #. 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 "Rimuovi i tag dalle way interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr "Funzione di unione delle Aree"
@@ -1672,4 +1698,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 +1716,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 "su"
@@ -1710,4 +1738,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
@@ -1727,8 +1756,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 "giù"
@@ -1810,15 +1840,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] ""
-"Impossibile aprire {0} file perché non è disponibile alcun importatore di "
-"file."
 msgstr[1] ""
-"Impossibile aprire {0} file perché non è disponibile alcun importatore di "
-"file."
-
-#: ../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>"
@@ -1826,9 +1863,9 @@
 "<html>Impossibile aprire la cartella \"{0}\".<br>Selezionare un file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr "Apri file"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1837,5 +1874,5 @@
 msgstr[1] "Aprendo {0} files..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1970,7 +2007,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
@@ -2146,5 +2183,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 "Salva"
@@ -2160,30 +2197,30 @@
 msgstr "Il file {0} esiste. Sovrascrivere?"
 
-#: ../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 "Non è stato trovato nessun Exporter! Nessun salvataggio."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Documento vuoto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "Salva comunque"
 
-#: ../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 "Il documento non contiene dati"
 
 #. 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 "Conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "Rifiuta i conflitti e Salva"
 
-#: ../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 "
@@ -2193,13 +2230,13 @@
 "gestiti come se si fossero stati tutti rifiutati. Continuare?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "Salva file OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "Salva in un file GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "Salva livello"
@@ -2254,5 +2291,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
@@ -2262,55 +2299,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 "Chiudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Semplifica percorso"
 
-#: ../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 "Elimina i nodi non necessari dal percorso."
 
-#: ../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 "Si, elimina i nodi"
-
-#: ../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 "Elimina i nodi esterni all’area scaricata"
-
-#: ../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 "No, annulla"
-
-#: ../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 "Annulla l’operazione"
-
-#: ../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 "Eliminarli comunque?"
-
-#: ../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 "Eliminare i nodi esterni all’area?"
-
-#: ../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 "Selezionare almeno un percorso da semplificare."
 
-#: ../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
@@ -2321,10 +2325,16 @@
 msgstr "Si"
 
-#: ../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 "Semplifica tutti i percorsi selezionati"
 
-#: ../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 "Annulla l’operazione"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2333,10 +2343,10 @@
 msgstr "La selezione contiene {0} percorsi. Semplificarli tutti?"
 
-#: ../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 "Semplificare i percorsi?"
 
-#: ../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
@@ -2346,5 +2356,5 @@
 msgstr[1] "Semplifica {0} percorsi"
 
-#: ../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)"
@@ -2410,5 +2420,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 "
@@ -2420,5 +2430,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 "
@@ -2456,38 +2466,38 @@
 msgstr "Duplica i nodi usati da più percorsi."
 
-#: ../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 "Questo nodo non è attaccato ad altri elementi."
 
-#: ../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 "Nessuno di questi nodi è attaccato ad altri elementi."
 
-#: ../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 "Nessun nodo di questo percorso è attaccato ad altri elementi."
 
-#: ../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 "La selezione corrente non può essere utilizzata per la separazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "Selezionare uno di questi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* Un nodo etichettato, oppure"
 
-#: ../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 "* Un nodo che è usato da più di un percorso, oppure"
 
-#: ../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 ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
 
-#: ../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"
@@ -2496,5 +2506,5 @@
 "oppure"
 
-#: ../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."
@@ -2503,5 +2513,5 @@
 "percorso."
 
-#: ../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"
@@ -2516,14 +2526,14 @@
 "e tutti i nodi saranno selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr "Nodo staccato"
 
-#: ../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 "Duplica in {0} nodi"
 
-#: ../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"
@@ -2531,4 +2541,21 @@
 msgstr[0] "Duplica {0} nodo in {1} nodi"
 msgstr[1] "Duplica {0} nodi in {1} nodi"
+
+#: ../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
@@ -2541,5 +2568,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
-msgstr "Annulla l''ultima azione."
+msgstr "Annulla l'ultima azione."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
@@ -2629,15 +2656,15 @@
 msgstr "Selezione vuota"
 
-#: ../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 "Carica dati"
 
-#: ../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 ""
 "Carica tutte le modifiche presenti nel livello dei dati attivo sul server OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2648,5 +2675,5 @@
 "è necessario risolverli.</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
@@ -2654,5 +2681,5 @@
 msgstr "Nessun cambiamento da caricare."
 
-#: ../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 "Niente da caricare. Prima è necessario ottenere dei dati."
@@ -3158,8 +3185,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
@@ -3576,5 +3603,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 "Cerca"
@@ -3825,5 +3852,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 "Altro"
@@ -3976,6 +4003,6 @@
 msgstr "Impossibile risolvere il conflitto irrisolto"
 
-#: ../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 ""
@@ -3983,20 +4010,20 @@
 "vuota"
 
-#: ../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 "Cancella nodo {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 "Cancella percorso {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 "Elimina relazione {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"
@@ -4005,5 +4032,5 @@
 msgstr[1] "Elimina {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} node"
@@ -4012,5 +4039,5 @@
 msgstr[1] "Elimina {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -4019,5 +4046,5 @@
 msgstr[1] "Elimina {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -4026,13 +4053,15 @@
 msgstr[1] "Elimina {0} relazioni"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:188
 #, java-format
 msgid "Deleted ''{0}''"
 msgstr "Eliminato ''{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 "Conferma di cancellazione"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:431
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -4044,14 +4073,5 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../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 "Conferma di cancellazione"
-
-#. 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 "
@@ -4274,4 +4294,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}''"
@@ -4279,19 +4300,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 "Valore ''''{0}'''' non valido per la longitudine"
 
-#: ../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 "Attenzione: è fallita la persistenza delle preferenze su ''{0}''"
 
-#: ../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 "Errore di formato nel file di configurazione alla linea {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4302,5 +4324,5 @@
 "delle preferenze ''{0}'' non è in realtà una cartella."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4311,5 +4333,5 @@
 "preferenze ''{0}'' non è in realtà una cartella.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4320,5 +4342,5 @@
 "possibile creare la cartella delle preferenze mancante: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4329,5 +4351,5 @@
 "creare la cartella delle preferenze mancante: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4337,5 +4359,5 @@
 "file di preferenze predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4346,5 +4368,5 @@
 "file predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4355,5 +4377,5 @@
 "reimpostare il file delle preferenze con uno predefinito: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4365,5 +4387,5 @@
 "predefinito.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4374,5 +4396,5 @@
 "ripristinare il file delle preferenze con i valori predefiniti: {0}"
 
-#: ../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}"
@@ -4448,20 +4470,20 @@
 msgstr "Coordinate proiettate"
 
-#: ../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 "S"
 
-#: ../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 "N"
 
-#: ../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 "O"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4480,5 +4502,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}."
@@ -4486,5 +4508,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}."
@@ -4504,5 +4526,5 @@
 msgstr "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346
 #, java-format
 msgid ""
@@ -4512,5 +4534,5 @@
 "incluso"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817
 #, java-format
 msgid ""
@@ -4586,5 +4608,5 @@
 msgstr "C''è una intersezione tra percorsi."
 
-#: ../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 "
@@ -4593,5 +4615,5 @@
 "Impossibile unire perché una delle primitive coinvolte è nuova e l''altra no"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952
 #, java-format
 msgid ""
@@ -4604,5 +4626,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"
@@ -4625,6 +4647,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"
@@ -4989,5 +5011,5 @@
 msgstr "Trasversa di Mercatore"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
+#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:271
 #, java-format
 msgid ""
@@ -5017,4 +5039,9 @@
 msgid "Running test {0}"
 msgstr "Esecuzione controllo {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
@@ -5070,72 +5097,99 @@
 msgstr "Percorsi incrociati"
 
-#: ../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 "Duplica nodi"
 
-#: ../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 ""
 "Questo controllo verifica che non ci siano due nodi nella stessa posizione."
 
-#: ../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 "Nodi duplicati in due percorsi non chiusi"
 
-#: ../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 "Nodi duplicati"
 
-#: ../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 "Nodi duplicati di tipo misto"
 
-#: ../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 "Nodi stradali duplicati"
 
-#: ../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 "Nodi ferroviari duplicati"
 
-#: ../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 "Nodi nautici duplicati"
 
-#: ../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 "Nodi di confine duplicati"
 
-#: ../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 "Nodi di rete elettrica duplicati"
 
-#: ../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 "Nodi duplicati naturali"
 
-#: ../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 "Nodi duplicati di edifici"
 
-#: ../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 "Nodi duplicati dell''utilizzo di terreno"
 
-#: ../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 "Altri nodi duplicati"
 
-#: ../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 "Nodi nella stessa posizione"
@@ -5202,54 +5256,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 "Multi-poligono"
 
-#: ../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 "Questo controllo verifica che i multi-poligoni siano validi"
 
-#: ../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 "Percorso di tipo area non chiuso"
 
-#: ../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 "Nessun percorso esterno per il multi-poligono"
 
-#: ../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 "Nessuno stile per il multi-poligono"
 
-#: ../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 "Nessuno stile nella relazione di tipo multi-poligono"
 
-#: ../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 "Lo stile del percorso interno è identico al multi-poligono"
 
-#: ../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 "Lo stile del percorso esterno non è coerente"
 
-#: ../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 "Il multi-poligono non è chiuso"
 
-#: ../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 "Il percorso interno del multi-poligono è esterno"
 
-#: ../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 "Intersezione tra i percorsi dei multi-poligoni"
 
-#: ../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 "Nessun ruolo utile per il membro del multi-poligono"
 
-#: ../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 "Nel multi-poligono è presente un elemento che non è un percorso"
@@ -5288,4 +5342,9 @@
 "duplicati)."
 
+#: ../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."
@@ -5300,29 +5359,25 @@
 "utilizzato da più di un percorso."
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103
-msgid "Overlapping areas"
-msgstr "Aree sovrapposte"
-
-#: ../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 "Strade sovrapposte (ad area)"
 
-#: ../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 "Ferrovie sovrapposte (ad area)"
 
-#: ../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 "Percorsi sovrapposti (ad area)"
 
-#: ../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 "Strade sovrapposte"
 
-#: ../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 "Ferrovie sovrapposte"
 
-#: ../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 "Percorsi sovrapposti"
@@ -5536,7 +5591,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
@@ -5557,7 +5612,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
@@ -5583,5 +5638,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."
@@ -5753,48 +5808,48 @@
 msgstr "L''ultimo percorso \"via\" ed il percorso \"to\" non sono connessi."
 
-#: ../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 "Percorsi non chiusi."
 
-#: ../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 "Controlla se i percorsi che dovrebbero essere circolari siano chiusi"
 
-#: ../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 "elemento naturale tipo {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 "tipologia di area {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 "struttura di servizio di tipo {0}"
 
-#: ../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 "Tipo di sport {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:88
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:86
 #, java-format
 msgid "tourism type {0}"
 msgstr "Tipo di turismo {0}"
 
-#: ../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 "tipo di negozio {0}"
 
-#: ../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 "struttura per lo svago di tipo {0}"
 
-#: ../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}"
@@ -5842,7 +5897,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"
@@ -5854,10 +5909,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 "area"
 
-#: ../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 "Percorso non chiuso"
@@ -5993,7 +6048,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}]"
@@ -6034,14 +6089,15 @@
 msgstr "Non visualizzare nuovamente (ricorda la scelta)"
 
-#: ../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 "incompleto"
 
 #. 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}"
@@ -6050,6 +6106,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}"
@@ -6057,12 +6113,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 "Numero civico {0}"
 
-#: ../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 "strada"
@@ -6070,17 +6126,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 "Linea ferroviaria"
 
-#: ../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 "Corso d’acqua"
 
-#: ../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 "Uso del terreno"
@@ -6089,8 +6145,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
@@ -6101,6 +6157,6 @@
 msgstr[1] "{0} nodi"
 
-#: ../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"
@@ -6109,9 +6165,9 @@
 msgstr[1] "{0} membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr "trasporto pubblico"
 
-#: ../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
@@ -6217,5 +6273,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 "Immagini aeree"
@@ -6470,5 +6526,5 @@
 "più usata."
 
-#: ../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"
@@ -6476,10 +6532,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 "Visualizza"
 
-#: ../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
@@ -6488,5 +6544,5 @@
 msgstr "Strumenti"
 
-#: ../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
@@ -6494,5 +6550,5 @@
 msgstr "Preimpostazioni"
 
-#: ../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
@@ -6503,5 +6559,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Audio"
@@ -6538,5 +6594,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"
@@ -6544,5 +6600,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"
@@ -6703,5 +6759,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
@@ -6894,5 +6950,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
@@ -6902,5 +6958,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"
@@ -6910,5 +6966,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 "Membri"
@@ -7159,5 +7215,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
@@ -7296,4 +7352,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 "cancellato"
@@ -7368,6 +7425,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
@@ -7389,6 +7446,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
@@ -7502,5 +7559,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"
@@ -7587,5 +7644,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
@@ -7597,5 +7654,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
@@ -7748,9 +7805,9 @@
 msgstr "Visualizza solamente le etichette con valori multipli"
 
-#: ../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 "Solamente per gli oggetti selezionati"
 
-#: ../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."
@@ -7763,14 +7820,14 @@
 "corrente.</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 "Gruppi di modifiche"
 
-#: ../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 "Apri la lista dei gruppi di modifiche nel livello corrente."
 
-#: ../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 ""
@@ -7778,5 +7835,5 @@
 "selezionati"
 
-#: ../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
@@ -7784,5 +7841,5 @@
 msgstr "Scarica"
 
-#: ../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 ""
@@ -7790,19 +7847,19 @@
 "selezionati"
 
-#: ../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 "Chiude i gruppi di modifiche aperti selezionati"
 
-#: ../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 "Mostra informazioni"
 
-#: ../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 "Apri una pagina web per ogni gruppo di modifiche selezionato"
 
 #. 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
@@ -7810,5 +7867,5 @@
 msgstr "Dettagli"
 
-#: ../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 ""
@@ -7830,12 +7887,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
@@ -7886,5 +7943,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
@@ -8067,19 +8124,13 @@
 "</p><p>Chiudi la finestra di filtro per vedere tutti gli oggetti.<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 "Cronologia"
-
-#: ../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 "Visualizza la cronologia di tutti gli oggetti selezionati."
 
-#: ../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 "Oggetto con storico"
 
-#: ../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
@@ -8089,5 +8140,5 @@
 msgstr "Ricarica"
 
-#: ../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 ""
@@ -8096,5 +8147,5 @@
 
 #. 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
@@ -8106,151 +8157,140 @@
 msgstr "Visualizza"
 
-#: ../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 "Visualizza lo storico degli oggetti selezionati."
 
-#: ../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 "Informazioni avanzate sull''oggetto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77
 msgid "map style"
 msgstr "stile della mappa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-msgid "In conflict with:\n"
-msgstr "In conflitto con:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
-#, java-format
-msgid "Node id={0}"
-msgstr "ID nodo={0}"
-
-#: ../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 " non nell''insieme dei dati"
-
-#: ../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 "Percorso: "
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
-msgid " incomplete\n"
-msgstr " incompleto\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157
-#, java-format
-msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
-msgstr " lat={0} lon={1} (proiezione: x={2}, y={3}); "
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:167
-#, java-format
-msgid "Way id={0}"
-msgstr "ID percorso={0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
-#, java-format
-msgid " {0} node; "
-msgid_plural " {0} nodes; "
-msgstr[0] " {0} nodo; "
-msgstr[1] " {0} nodi; "
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182
-msgid "  nodes:\n"
-msgstr "  nodi:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
-#, java-format
-msgid "Relation id={0}"
-msgstr "ID relazione={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] " {0} membro; "
-msgstr[1] " {0} membri; "
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:204
-msgid "  members:\n"
-msgstr "  membri:\n"
-
-#: ../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 "<nuovo oggetto>"
 
-#: ../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 ""
-"Insieme dei dati: {0}; Utente: [{1}]; ID dell''insieme di modifiche: {2}; "
-"Data e ora: {3}; Versione: {4}"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
-msgid "; deleted"
-msgstr "; eliminato"
+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 "; eliminato-sul-server"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227
-msgid "; modified"
-msgstr "; modificato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230
-msgid "; filtered/hidden"
-msgstr "; filtrato/nascosto"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233
-msgid "; filtered/disabled"
-msgstr "; filtrato/disabilitato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:236
-msgid "; has direction keys"
-msgstr "; possiede chiavi di direzione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:238
-msgid " (reversed)"
-msgstr " (invertito)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:246
-msgid "  tags:\n"
-msgstr "  etichette:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:258
-msgid "  way referrer:\n"
-msgstr "  percorso collegato:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:269
-msgid "  relation referrer:\n"
-msgstr "  relazione collegata:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:295
-#, java-format
-msgid "id: {0}"
-msgstr "id: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:297
-#, java-format
-msgid " name: {0}"
-msgstr " nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300
-#, java-format
-msgid " {0} name: {1}"
-msgid_plural " {0} names: {1}"
-msgstr[0] " {0} nome: {1}"
-msgstr[1] " {0} nomi: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
+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: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 "Cache degli stili per \"{0}\":"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
 #, java-format
 msgid ""
@@ -8263,5 +8303,5 @@
 "> applico {0} stile \"{1}\"\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:333
 #, java-format
 msgid ""
@@ -8272,5 +8312,5 @@
 "Intervallo:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:338
 #, java-format
 msgid ""
@@ -8283,5 +8323,5 @@
 "> ignoro \"{0}\" (non attivo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -8293,13 +8333,13 @@
 "Lista degli stili generati:\n"
 
-#: ../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 "I 2 oggetti selezionati hanno le cache dello stile identiche."
 
-#: ../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 "I 2 oggetti selezionati hanno le cache dello stile differenti."
 
-#: ../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."
@@ -8308,9 +8348,9 @@
 "ma non identiche."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:367
 msgid "xml"
 msgstr "xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:369
 msgid "mapcss"
 msgstr "mapcss"
@@ -8328,5 +8368,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
@@ -8338,10 +8378,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
@@ -8439,5 +8479,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 "Mostra/Nascondi"
@@ -8456,5 +8496,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 "Attiva"
@@ -8489,9 +8529,9 @@
 msgstr "questo livello non è attualmente attivo (cliccare per attivare)"
 
-#: ../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 "Sposta il livello selezionato in su."
 
-#: ../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 "Sposta il layer selezionato in giù."
@@ -8566,5 +8606,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"
@@ -8607,24 +8647,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 "Relazioni"
 
-#: ../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 "Apri una lista di tutte le relazioni"
 
-#: ../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 "Apri le relazioni selezionate in un editor"
 
-#: ../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 "Cancella le relazioni selezionate"
 
-#: ../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
@@ -8633,5 +8673,5 @@
 msgstr "Crea una nuova relazione"
 
-#: ../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
@@ -8641,134 +8681,126 @@
 "dell''editor"
 
-#: ../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 "Aggiungi le relazioni selezionate alla selezione corrente"
 
-#: ../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 "Imposta la selezione corrente con la lista delle relazioni selezionate"
 
-#: ../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 "Seleziona relazione (aggiungi)"
 
-#: ../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 "Selezionare la relazione"
 
-#: ../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 ""
 "Aggiungi i membri di tutte le relazioni selezionate alla selezione corrente"
 
-#: ../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 "Seleziona i membri di tutte le relazioni selezionate"
 
-#: ../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 "Seleziona membri (aggiungi)"
 
-#: ../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 "Seleziona membri"
 
-#: ../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 "Scarica tutti i membri delle relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Download members"
 msgstr "Scarica membri"
 
-#: ../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 "Scarica i membri incompleti delle relazioni selezionate"
 
-#: ../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 "Scarica membri incompleti"
 
-#: ../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 "Relazioni: {0}"
 
-#: ../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 "Selezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+msgid "Open a selection list window."
+msgstr "Apri una finestra con la lista delle selezioni."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 msgid "Current Selection"
 msgstr "Selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "Apri una finestra con la lista delle selezioni."
-
-#: ../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 "Cerca oggetti"
 
+#: ../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 "Ingrandisci visuale sulla selezione"
 
+#: ../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 "Ingrandisci la visuale sugli elementi selezionati"
 
-#: ../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 "Apri editor per la relazione"
 
-#: ../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 "Apri l''editor delle relazioni per la relazione selezionata"
 
-#: ../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 "Seleziona nella lista delle relazioni"
 
-#: ../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 "Selezionare la relazione nella lista delle relazioni"
 
-#: ../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 "Selezione"
-
-#: ../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 "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{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 "Selezione: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
-msgid "Get detailed information on the internal state of the objects."
-msgstr "Ottieni informazioni dettagliate sullo stato interno degli oggetti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
-msgid "Inspect"
-msgstr "Analizza"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
@@ -8862,11 +8894,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 "Apre la finestra di verifica."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
 msgid "Validation results"
 msgstr "Risultati della validazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
-msgid "Open the validation window."
-msgstr "Apre la finestra di verifica."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -9227,4 +9262,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" />
@@ -9280,8 +9320,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" />
@@ -10066,5 +10102,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
@@ -10075,179 +10111,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
@@ -10733,9 +10770,9 @@
 "L’indirizzo URL per l’interrogazione sui gruppi di modifiche non è valido"
 
-#: ../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 "Aggiungi proprietà"
 
-#: ../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."
@@ -10744,14 +10781,14 @@
 msgstr[1] "Questo modificherà fino a {0} oggetti."
 
-#: ../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 "Un campo vuoto cancellerà il tag"
 
-#: ../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
@@ -10763,5 +10800,5 @@
 msgstr "<diverso>"
 
-#: ../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?"
@@ -10769,13 +10806,13 @@
 msgstr[1] "Modificare i valori?"
 
-#: ../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 "Sovrascrivi chiave"
 
-#: ../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 "Sostituisci"
 
-#: ../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 ""
@@ -10786,5 +10823,5 @@
 "La nuova chiave è già utilizzata, sovrascrivere i valori?"
 
-#: ../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
@@ -10794,5 +10831,5 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../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."
@@ -10801,31 +10838,31 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../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 "Seleziona una chiave"
 
-#: ../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 "Seleziona un valore"
 
-#: ../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 "Aggiungere il valore?"
 
-#: ../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 "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
 
-#: ../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 "Proprietà/Appartenenze"
 
-#: ../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 "Proprietà per gli oggetti selezionati."
 
 #. 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"
@@ -10834,64 +10871,88 @@
 #. <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 "Posizione"
 
-#: ../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 "Proprietà: {0} / Appartenenze: {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 "Proprietà / Appartenenze"
 
-#: ../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 "Cambia relazione"
 
-#: ../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 "Elimina dalla relazione"
 
-#: ../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 "Vuoi veramente cancellare la selezione dalla relazione {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 "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../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 "Elimina proprietà"
 
-#: ../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 "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../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 "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../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 "Vai al wiki di OSM per la documentazione relativa all''etichetta (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 "Avvia il browser con la documentazione sull''oggetto selezionato"
 
-#: ../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 "Selezionare la relazione nella selezione principale"
 
-#: ../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 "Seleziona i membri della relazione selezionata"
+
+#: ../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 ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:175
@@ -11431,14 +11492,14 @@
 "maxlat): </html>"
 
-#: ../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 "Crea segnalibro"
 
-#: ../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 "Aggiungi un segnalibro per l''area di scarico attualmente selezionata"
 
-#: ../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."
@@ -11447,43 +11508,43 @@
 "un''area."
 
-#: ../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 "Inserire un nome per il segnalibro dell''area di scarico."
 
-#: ../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 "Nome della posizione"
 
-#: ../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 "Rimuovi i segnalibri attualmente selezionati"
 
-#: ../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 "Rinomina i segnalibri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:103
 msgid "min lat"
 msgstr "Lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lon"
 msgstr "Lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "max lat"
 msgstr "Lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lon"
 msgstr "Lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "Clear textarea"
 msgstr "Svuota l''area di testo"
 
-#: ../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 "
@@ -11493,10 +11554,10 @@
 "indirizzo URL qui per scaricare l''area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "Riquadro di selezione"
 
-#: ../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
@@ -11505,15 +11566,15 @@
 msgstr "La stringa ''{0}'' non è un valore in doppia precisione valido."
 
-#: ../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 "Per la latitudine è richiesto un valore nell''intervallo [-90,90]."
 
-#: ../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 "Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
 
-#: ../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"
@@ -11602,13 +11663,4 @@
 msgid "Bounds"
 msgstr "Confini"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
-msgid "Near"
-msgstr "Vicino a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
-msgctxt "placeselection"
-msgid "Zoom"
-msgstr "Ingrandimento"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102
@@ -11656,7 +11708,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"
@@ -11672,12 +11729,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
@@ -11777,4 +11835,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"
@@ -11815,5 +11875,5 @@
 msgstr "Longitudine: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138
 msgid "Coordinates"
 msgstr "Coordinate"
@@ -11838,5 +11898,5 @@
 msgstr "Ricarica lo storico dal server"
 
-#: ../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 ""
@@ -11844,6 +11904,6 @@
 "riferimento."
 
-#: ../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 ""
@@ -11853,5 +11913,5 @@
 "corrisponde allo storico con ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:288
 #, java-format
 msgid ""
@@ -11861,5 +11921,5 @@
 "è disponibile nello storico."
 
-#: ../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 ""
@@ -11867,5 +11927,5 @@
 "primitiva corrente."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:318
 #, java-format
 msgid ""
@@ -11952,14 +12012,14 @@
 "<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:123
 msgid "Changeset info"
 msgstr "Informazioni sul gruppo di modifiche"
 
-#: ../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 ""
 "Lancia il browser con le informazioni relative all''insieme di modifiche"
 
-#: ../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}"
@@ -12605,5 +12665,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
@@ -12615,11 +12675,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 "Livello"
@@ -12639,5 +12699,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 "Carica"
@@ -12660,5 +12720,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
@@ -12671,5 +12731,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 "Etichette del nuovo insieme di modifiche"
@@ -12690,30 +12750,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 "Caricamento su ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Upload Changes"
 msgstr "Carica le modifiche"
 
-#: ../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 "Carica le primitive modificate"
 
-#: ../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 "Si prega di rivedere il commento al caricamento"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid "Revise"
 msgstr "Rivedi"
 
-#: ../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 "Utilizza così com''è"
 
-#: ../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 "
@@ -12731,34 +12791,34 @@
 "mappatori."
 
-#: ../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 ""
 "Ritorna alla finestra precedente per inserire un commento più significativo"
 
-#: ../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 "Annulla e ritorna alla finestra precedente"
 
-#: ../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 "Ignora questo suggerimento e carica ugualmente"
 
-#: ../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 "Non mostrare più questo messaggio"
 
-#: ../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 "Si prega di inserire prima una dimensione del raggruppamento valida"
 
-#: ../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 "Dimensione del raggruppamento non valida"
 
-#: ../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 "Annulla il caricamento e ritorna alle modifiche"
 
-#: ../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}"
@@ -13168,5 +13228,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
@@ -13551,5 +13611,5 @@
 msgstr "Sono stati trovati i seguenti problemi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
 #, java-format
 msgid ""
@@ -13562,65 +13622,65 @@
 "Modificare la proiezione o rimuovere il livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
 msgid "Auto Zoom"
 msgstr "Ingrandimento automatico"
 
-#: ../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 "Carica automaticamente i tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:365
 msgid "Show Errors"
 msgstr "Visualizza errori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../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 "Mostra informazioni sul tassello"
 
-#: ../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 "Carica tutti i tasselli"
 
-#: ../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 "Carica tutti i tasselli con errori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
 msgid "Increase zoom"
 msgstr "Aumenta l''ingrandimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:436
 msgid "Decrease zoom"
 msgstr "Diminuisci l''ingrandimento"
 
-#: ../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 "Blocca alla dimensione del tassello"
 
-#: ../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 "Svuota la cache dei tasselli"
 
-#: ../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 "ingrandire per caricare dei tasselli"
 
-#: ../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 "ingrandire per caricare più tasselli"
 
-#: ../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 "aumenta il livello di ingrandimento per vedere più dettagli"
 
-#: ../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 "Nessun tassello in questo livello di ingrandimento"
 
-#: ../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 "Sono supportate le proiezioni EPSG:4326 e di Mercatore"
@@ -13635,16 +13695,5 @@
 msgstr "Nessun errore individuato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:153
-#, java-format
-msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
-msgstr ""
-"Attenzione: il livello WMS è stato disattivato a causa dell''indirizzo url "
-"non corretto ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:155
-msgid "(deactivated)"
-msgstr "(disattivato)"
-
-#: ../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}"
@@ -13652,35 +13701,14 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../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 "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../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 ""
-"<html>L''indirizzo URL<br>''{0}''<br>per questo livello WMS non finisce con "
-"una ''&'' e neanche con un ''?''.<br>Questo può causare delle richieste WMS "
-"non valide.<br>Si dovrebbero controllare le proprie impostazioni.<br>Si "
-"desidera ottenere ugualmente i tasselli WMS?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:262
-msgid "Yes, fetch images"
-msgstr "Si, preleva le immagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:268
-msgid "Invalid URL?"
-msgstr "Indirizzo URL non valido?"
-
-#: ../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 "Scarica i tasselli visibili"
 
-#: ../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"
@@ -13689,58 +13717,58 @@
 "visuale, oppure di cambiare la risoluzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../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 "Ricarica i tasselli non corretti"
 
-#: ../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 channel"
 
-#: ../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 "Salva il livello WMS su file"
 
-#: ../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 "Salva livello WMS"
 
-#: ../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 "Carica il livello WMS da file"
 
-#: ../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 "Carica livello WMS"
 
-#: ../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 "Versione del file WMS non supportata; trovata {0}, attesa {1}"
 
-#: ../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 "Errore nel formato del file"
 
-#: ../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 "Errore durante il caricamento del file"
 
-#: ../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 "Imposta segnalibro WMS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
 msgid "Automatic downloading"
 msgstr "Scaricamento automatico"
 
-#: ../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 "Ingrandisci la visuale alla risoluzione originale"
 
-#: ../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}"
@@ -14126,5 +14154,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"
@@ -14342,4 +14373,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 "Salva token di accesso nelle preferenze"
@@ -14515,4 +14547,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"
@@ -14610,8 +14644,4 @@
 "Si prega di inserire un token di accesso OAuth autorizzato ad accedere al "
 "server OSM ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
-msgid "Save Access Token to preferences"
-msgstr "Salva il token di accesso nelle preferenze"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
@@ -15027,26 +15057,26 @@
 msgstr "Ottenimento delle informazioni utente..."
 
-#: ../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 "Nome del menu"
 
-#: ../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 "Livello di immagini aeree senza nome"
 
-#: ../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 "Indirizzo URL del servizio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:106
 msgid "Get Layers"
 msgstr "Ottieni i livelli"
 
-#: ../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"
@@ -15056,49 +15086,48 @@
 "quindi non lo si può utilizzare. Questo messaggio non sarà più visualizzato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
-#: ../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
+#: ../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 "Errore WMS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:179
 msgid "Show Bounds"
 msgstr "Visualizza confini"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:181
 msgid "No bounding box was found for this layer."
 msgstr "Non è stato trovato alcun riquadro di selezione per questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:191
 msgid "TMS URL"
 msgstr "Indirizzo URL TMS"
 
-#: ../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 "Ingrandimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:214
 msgid "TMS"
 msgstr "TMS"
 
-#: ../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 "Indirizzo URL delle immagini aeree"
 
-#: ../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 "Impossibile analizzare la lista dei livelli WMS."
 
-#: ../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 "Indirizzo URL del servizio non valido."
 
-#: ../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 "Impossibile ottenere la lista dei livelli WMS."
@@ -15336,5 +15365,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}"
@@ -15479,5 +15508,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
@@ -15546,5 +15575,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 "Automobile"
@@ -15570,14 +15599,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 "Bicicletta"
@@ -15616,13 +15645,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 "Pedone"
@@ -15785,93 +15814,93 @@
 msgstr "Schema di etichettatura audio dei punti del percorso non corretta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
 msgid "imagery fade"
 msgstr "dissolvenza delle immagini aeree"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:136
 msgid "Fade Color: "
 msgstr "Colore della dissolvenza: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:140
 msgid "Fade amount: "
 msgstr "Grado di dissolvenza: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:146
 msgid "Soft"
 msgstr "Leggero"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:132
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:147
 msgid "Strong"
 msgstr "Forte"
 
-#: ../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 "Contrasto (è necessario aggiungere nuovamente il livello): "
 
-#: ../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 "Utilizza lo scostamento del server: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:174
 msgid "Downloader:"
 msgstr "Downloader:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180
 msgid "Overlap tiles"
 msgstr "Sovrapponi i tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181
 msgid "% of east:"
 msgstr "% est:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
 msgid "% of north:"
 msgstr "% nord:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197
 msgid "Simultaneous connections"
 msgstr "Connessioni simultanee"
 
-#: ../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 "Ingrandimento automatico predefinito: "
 
-#: ../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 "Caricamento automatico dei tasselli predefinito: "
 
-#: ../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 "Livello min. di ingrandimento: "
 
-#: ../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 "Livello max. di ingrandimento: "
 
-#: ../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 "Aggiungi al selezionatore slippymap: "
 
-#: ../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 "Cartella di cache per i tasselli: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255
 msgid "Common Settings"
 msgstr "Impostazioni comuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256
 msgid "WMS Settings"
 msgstr "Impostazioni WMS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257
 msgid "TMS Settings"
 msgstr "Impostazioni TMS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Imagery Preferences"
 msgstr "Impostazioni delle immagini aeree"
 
-#: ../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 ""
@@ -15879,21 +15908,25 @@
 "\"Immagini aeree\""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274
 msgid "Imagery providers"
 msgstr "Fornitori di immagini aeree"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276
 msgid "Offset bookmarks"
 msgstr "Segnalibri degli scostamenti"
 
-#: ../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 "Voci predefinite disponibili:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:428
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:504
 msgid "Selected entries:"
 msgstr "Voci selezionate:"
 
-#: ../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
@@ -15904,37 +15937,37 @@
 msgstr "Nuovo"
 
-#: ../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 "Aggiungi un nuovo elemento WMS/TMS inserendo l''indirizzo URL"
 
-#: ../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 "Aggiungi indirizzo URL di immagini aeree"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:619
 msgid "Remove entry"
 msgstr "Rimuovi elemento"
 
-#: ../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 "copia le voci predefinite selezionate"
 
-#: ../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 "Selezionare almeno una riga da copiare."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:549
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:707
 msgid "reload defaults"
 msgstr "ricarica voci predefinite"
 
-#: ../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 "Nome del menu (predefinito)"
 
-#: ../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 "Indirizzo URL delle immagini aeree (predefinito)"
 
-#: ../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}"
@@ -15943,5 +15976,5 @@
 "disponibile: {0}"
 
-#: ../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}"
@@ -15950,13 +15983,13 @@
 "formato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Projection"
 msgstr "Proiezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Easting"
 msgstr "Est"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Northing"
 msgstr "Nord"
@@ -16588,7 +16621,9 @@
 msgstr "Modifica sorgente:"
 
+#. 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 "Azzera"
@@ -17224,5 +17259,5 @@
 msgstr "Aggiungi una nuova etichetta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479
 #, java-format
 msgid ""
@@ -17233,5 +17268,5 @@
 "''display_values'' deve essere lo stesso di ''values''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:484
 #, java-format
 msgid ""
@@ -17273,28 +17308,28 @@
 msgstr "Attributi opzionali:"
 
-#: ../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 "Usa la preimpostazione \"{0}\" del gruppo \"{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 "Usa la preimpostazione ''{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 "Tipo sconosciuto: {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 "Elemento ruolo preimpostato senza genitori"
 
-#: ../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 "Sotto-elemento preimpostato senza genitori"
 
-#: ../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
@@ -17304,15 +17339,15 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {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 "Impossibile leggere {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 "Sono supportati elementi di tipo {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1328
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1349
 #: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
@@ -17322,22 +17357,22 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../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 "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
 msgid "New relation"
 msgstr "Nuova relazione"
 
-#: ../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"
@@ -17404,4 +17439,45 @@
 "Il valore corrente non è un ID OSM valido. Si prega di inserire un valore "
 "intero > 0"
+
+#: ../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 ""
+"Il percorso con ID esterno ''''{0}'''' include un nodo mancante con ID "
+"esterno ''''{1}''''."
+
+#: ../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 "Il nodo eliminato {0} fa parte del percorso {1}"
+
+#: ../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 ""
+"Il percorso {0} con {1} nodi ha dei nodi incompleti perché almeno un nodo "
+"non è presente nei dati caricati."
+
+#: ../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 ""
+"La relazione con ID esterno ''''{0}'''' si riferisce alla primitiva mancante "
+"con ID esterno ''''{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 "il membro eliminato {0} è utilizzato dalla relazione {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -18048,5 +18124,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
@@ -18180,5 +18256,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
@@ -18189,5 +18264,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
@@ -18221,4 +18296,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
@@ -18268,14 +18344,14 @@
 msgstr "il file \"{0}\" non esiste"
 
-#: ../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 "Nessun dato trovato nel file {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:58
 msgid "Open OSM file"
 msgstr "Apri file OSM"
 
-#: ../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
@@ -18287,12 +18363,11 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../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 ""
-"E’ stato trovato un elemento XML <nd> non come figlio diretto dell’elemento "
-"<way>."
-
-#: ../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 "Il percorso eliminato {0} contiene dei nodi"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
@@ -18301,5 +18376,5 @@
 msgstr "Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
 
-#: ../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
@@ -18311,18 +18386,11 @@
 "{0}."
 
-#: ../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 "Il percorso eliminato {0} contiene dei nodi"
-
-#: ../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 ""
-"E’ stato trovato l’elemento XML <member> non come figlio diretto "
-"dell’elemento <relation>."
-
-#: ../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 "La relazione eliminata {0} contiene dei membri"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
 #, java-format
@@ -18330,5 +18398,5 @@
 msgstr "Attributo ''''ref'''' mancante sul membro nella relazione {0}."
 
-#: ../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
@@ -18338,5 +18406,5 @@
 "{0}. Ottenuto {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
@@ -18345,5 +18413,5 @@
 msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}."
 
-#: ../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
@@ -18355,21 +18423,15 @@
 "relazione {1}. Ottenuto {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 "<member> incompleto, specificazione con 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 "La relazione eliminata {0} contiene dei membri"
-
-#: ../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 "Chiave o valore dell’attributo mancante nell’etichetta."
 
-#: ../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
@@ -18380,5 +18442,5 @@
 "ingresso. Omesso."
 
-#: ../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
@@ -18386,6 +18448,6 @@
 msgstr "Oggetto illegale con 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
@@ -18400,8 +18462,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
@@ -18417,5 +18479,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
@@ -18423,5 +18485,5 @@
 msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}."
 
-#: ../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
@@ -18430,6 +18492,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
@@ -18445,6 +18507,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
@@ -18455,5 +18517,5 @@
 msgstr "Valore non valido per l''attributo ''''changeset''''. Ottenuto {0}."
 
-#: ../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
@@ -18462,5 +18524,5 @@
 msgstr "Manca l''attributo obbligatorio ''''{0}''''."
 
-#: ../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
@@ -18470,58 +18532,19 @@
 "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
 
-#: ../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 ""
-"Il percorso con ID esterno ''''{0}'''' include un nodo mancante con ID "
-"esterno ''''{1}''''."
-
-#: ../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 "Il nodo eliminato {0} fa parte del percorso {1}"
-
-#: ../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 ""
-"Il percorso {0} con {1} nodi ha dei nodi incompleti perché almeno un nodo "
-"non è presente nei dati caricati."
-
-#: ../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 ""
-"La relazione con ID esterno ''''{0}'''' si riferisce alla primitiva mancante "
-"con ID esterno ''''{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 "il membro eliminato {0} è utilizzato dalla relazione {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 "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:542
 msgid "Parsing OSM data..."
 msgstr "Analisi dei dati OSM..."
 
-#: ../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 "Preparazione dell''insieme di dati..."
 
-#: ../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
@@ -18682,4 +18705,33 @@
 msgid "Unexpected id 0 for osm primitive found"
 msgstr "E'' stato trovato un identificativo 0 non atteso per una primitiva osm"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "File compressi gzip del server OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "Coordinate a zero: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "Chiusura del gruppo di modifiche {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, fuzzy, java-format
+msgid "Invalid timestamp: {0}"
+msgstr "Indirizzo URL {0} non valido"
+
+#: ../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 "Analisi dei dati OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
@@ -18705,13 +18757,4 @@
 msgstr "Salva nome utente e password (non cifrata)"
 
-#: ../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 ""
-"Attenzione: impossibile individuare il tipo della sorgente di immagini aeree "
-"''{0}''. Utilizzo il predefinito (xml)."
-
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
@@ -18728,35 +18771,4 @@
 msgid "Querying offset: {0}"
 msgstr "Interrogazione sullo scostamento in corso: {0}"
-
-#: ../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 ""
-"Attenzione: l''indirizzo URL di base ''{0}'' per un servizio WMS non può "
-"finire con il carattere ''&'' o il carattere ''?''."
-
-#: ../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 ""
-"Attenzione: il prelevamento dei tasselli WMS probabilmente fallisce. "
-"Verificare le proprie impostazioni."
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:149
-#, java-format
-msgid "Warning: The complete URL is ''{0}''."
-msgstr "Attenzione: l''indirizzo URL completo è ''{0}''."
-
-#: ../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 ""
-"La proiezione ''{0}'' della URL e quella in uso ''{1}'' non coincidono.\n"
-"Potrebbero essere presenti errori nelle coordinate."
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -19655,5 +19667,5 @@
 "</html>"
 
-#: ../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}."
@@ -19662,5 +19674,5 @@
 "{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
@@ -19672,5 +19684,5 @@
 "serio problema di configurazione. JOSM terminerà di funzionare."
 
-#: ../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
@@ -19681,6 +19693,6 @@
 "{1}"
 
-#: ../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 ""
@@ -19721,5 +19733,5 @@
 msgstr "inutilizzato"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -19733,5 +19745,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"
@@ -19741,5 +19753,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -19750,5 +19762,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 "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
@@ -20431,6 +20443,11 @@
 msgstr "Premette di filtrare i tracciati GPS non necessari"
 
+#. 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 ""
@@ -20438,10 +20455,10 @@
 
 #. Plugin imageryadjust
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "WMSPlugin-style imagery adjustment mapmode"
 msgstr "Stile di aggiustamento delle immagini aeree WMSPlugin"
 
 #. 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 "
@@ -20455,15 +20472,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 "Estensione per l''importazione di immagini georeferenziate"
 
 #. Plugin importvec
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Import vector graphics (SVG)"
 msgstr "Importa immagini vettoriali (SVG)"
 
 #. 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 "
@@ -20476,5 +20493,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -20485,10 +20502,10 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "A helper for IRS satellite adjustment."
 msgstr "Un assistente per la correzione satellitare IRS."
 
 #. 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 "
@@ -20500,10 +20517,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
 msgstr "Aiuta nella vettorizzazione delle immagini WMS."
 
 #. 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 "
@@ -20514,5 +20531,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."
@@ -20522,5 +20539,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 "
@@ -20533,5 +20550,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 "
@@ -20545,20 +20562,20 @@
 
 #. Plugin merge-overlap
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Merge overlapping part of ways."
 msgstr "Unisci le parti sovrapposte dei percorsi."
 
 #. 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 "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Simply convert an area to a multipolygon."
 msgstr "Converte semplicemente un''area in un multi-poligono."
 
 #. 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 ""
@@ -20567,5 +20584,5 @@
 
 #. 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. "
@@ -20576,5 +20593,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 "
@@ -20588,15 +20605,15 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "extended options for editing opening_hours"
 msgstr "opzioni avanzate per la modifica degli orari di apertura"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. 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"
@@ -20606,5 +20623,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."
@@ -20614,10 +20631,10 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid "Import PDF file and convert to ways."
 msgstr "Importa file PDF e converti in percorsi."
 
 #. 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 "
@@ -20628,5 +20645,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 "
@@ -20637,15 +20654,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin proj4j
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid "adds projections from Proj4J"
 msgstr "aggiungi proiezioni da Proj4J"
 
 #. 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."
@@ -20655,25 +20672,25 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid "Relation and multipolygon creating and editing panel."
 msgstr "Pannello di creazione e modifica della relazione e del multi-poligono."
 
 #. Plugin restart
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr "Aggiunge la voce &quot;Riavvia JOSM&quot; al menu File."
 
 #. Plugin reverter
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Plugin for reverting changesets"
 msgstr "Estensione per il ripristino dei gruppi di modifiche"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid "Use rgis.spb.ru image as overlay"
 msgstr "Utilizza rgis.spb.ru image come copertura"
 
 #. 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 "
@@ -20687,5 +20704,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 "
@@ -20697,10 +20714,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. 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 "
@@ -20713,20 +20730,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 "Crea e modifica mappe nautiche per OpenSeaMap"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare"
 
 #. 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 "
@@ -20740,15 +20757,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20760,5 +20777,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) "
@@ -20769,10 +20786,10 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid "Plugin to digital sign OSM-Data"
 msgstr "Estensione per firmare digitalmente i dati OSM"
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -20782,5 +20799,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20791,15 +20808,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:155
 msgid "Several utilities that make your life easier."
 msgstr "Alcuni strumenti per facilitarsi la vita."
 
 #. Plugin videomapping
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:157
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20812,5 +20829,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20822,5 +20839,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -20828,15 +20845,15 @@
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:161
+#: build/trans_plugins.java:163
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "Abilita la ricerca di un punto del percorso importato da un file gpx."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:163
+#: build/trans_plugins.java:165
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Seleziona una sequenza di percorsi connessi non ramificati"
 
 #. 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 "
@@ -21003,9 +21020,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 "Riferimento"
@@ -21058,6 +21075,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 "Velocità massima (km/h)"
@@ -21106,9 +21123,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 "Senso unico"
@@ -21158,9 +21175,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 "Ponte"
@@ -21201,9 +21218,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 "Galleria/tunnel"
@@ -21242,9 +21259,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 "Sbancamento"
@@ -21283,9 +21300,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 "Terrapieno"
@@ -21324,9 +21341,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 "Illuminazione stradale"
@@ -21412,4 +21429,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"
@@ -21427,8 +21445,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 "Rampa"
@@ -21448,4 +21467,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
@@ -21463,8 +21483,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 "10%"
@@ -21484,4 +21505,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
@@ -21499,8 +21521,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 "-10%"
@@ -21520,4 +21543,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
@@ -21535,8 +21559,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 "10°"
@@ -21556,4 +21581,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
@@ -21571,8 +21597,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 "-10°"
@@ -21645,5 +21672,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 "Slarghi per l''incrocio"
@@ -21675,10 +21702,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 "Larghezza (metri)"
@@ -21720,9 +21747,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 "Superficie"
@@ -21747,9 +21774,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 "pavimentata"
@@ -21773,9 +21800,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 "non pavimentata"
@@ -21799,9 +21826,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 "asfalto"
@@ -21826,9 +21853,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 "calcestruzzo"
@@ -21853,9 +21880,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 "metallo"
@@ -21875,4 +21902,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
@@ -21881,10 +21909,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 "legno"
@@ -21908,9 +21936,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 "lastricato"
@@ -21935,9 +21963,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 "ciottoli (pavé)"
@@ -21962,9 +21990,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 "ghiaia"
@@ -21988,9 +22016,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 "ciottoli"
@@ -22014,9 +22042,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 "compattato"
@@ -22040,9 +22068,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 "erba"
@@ -22067,9 +22095,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 "erba"
@@ -22094,9 +22122,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 "sabbia"
@@ -22122,10 +22150,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 "terra"
@@ -22276,5 +22304,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 "rotatoria"
@@ -22428,64 +22456,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
@@ -22561,8 +22589,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"
@@ -22592,8 +22620,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 "carico e scarico"
@@ -22643,9 +22671,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"
@@ -22688,9 +22716,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"
@@ -22711,7 +22739,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 "Agricolo"
@@ -22731,7 +22759,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 "forestale"
@@ -22871,61 +22899,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
@@ -22959,10 +22987,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 "ufficiale"
@@ -22994,10 +23022,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 "specifico"
@@ -23016,11 +23044,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 "Cavallo"
@@ -23038,5 +23066,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 "Veicoli a motore"
@@ -23057,12 +23085,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 "Motocicletta"
@@ -23080,10 +23108,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 "Automobile"
@@ -23183,6 +23211,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 "autostrada/tangenziale"
@@ -23190,5 +23218,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 "collegamento autostradale"
@@ -23208,6 +23236,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 "trunk"
@@ -23215,5 +23243,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 "trunk_link"
@@ -23233,6 +23261,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 "primaria"
@@ -23240,5 +23268,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 "svincolo primario"
@@ -23258,6 +23286,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 "secondaria"
@@ -23277,6 +23305,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 "terziaria"
@@ -23284,5 +23312,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 "unclassified"
@@ -23296,6 +23324,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 "residenziale"
@@ -23303,5 +23331,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 "living_street"
@@ -23342,6 +23370,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 "strada di servizio"
@@ -23349,5 +23377,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 "autobus guidato"
@@ -23372,7 +23400,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 "construction"
@@ -23408,11 +23436,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "Guado"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "Modifica guado"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "Percorsi"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr "Track"
@@ -23421,35 +23460,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 "Modifica Track"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "Tracktype"
 msgstr "Tipo di traccia"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade1"
 msgstr "grado1"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade2"
 msgstr "grado2"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade3"
 msgstr "grado3"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade4"
 msgstr "grado4"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade5"
 msgstr "grado5"
@@ -23457,10 +23496,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 "Scala di classificazione MTB"
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:546
+#: build/trans_presets.java:556
 msgid "General access"
 msgstr "Accesso Generale"
@@ -23468,5 +23507,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr "Percorso"
@@ -23475,45 +23514,45 @@
 #. 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 "Modifica percorso"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "SAC Scale"
 msgstr "Scala escursionistica SAC"
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T1 - hiking trail"
 msgstr "T1 - escursionismo"
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T2 - mountain hiking trail"
 msgstr "T2 - escursionismo alpino"
 
 #. 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 "T3 - Escursionisti esperti"
 
 #. 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 "T4 - sentiero alpino impegnativo, esposto e ripido"
 
 #. 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 "T5 - sentiero alpino impegnativo con scalate"
 
 #. 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 "T6 - sentiero alpino difficile con scalate"
 
 #. 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 ""
@@ -23522,5 +23561,5 @@
 
 #. 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, "
@@ -23531,5 +23570,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 "
@@ -23543,5 +23582,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 "
@@ -23553,5 +23592,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, "
@@ -23563,5 +23602,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, "
@@ -23573,5 +23612,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"
@@ -23579,10 +23618,10 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "excellent"
 msgstr "eccellente"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "good"
 msgstr "buona"
@@ -23590,15 +23629,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 "intermedio"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "bad"
 msgstr "cattiva"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "horrible"
 msgstr "orribile"
@@ -23621,23 +23660,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 "Sedie a rotelle"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:582
+#: build/trans_presets.java:592
 msgid "Ski"
 msgstr "Sci"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr "Motoslitta"
@@ -23646,5 +23685,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr "Percorso dedicato all''equitazione"
@@ -23652,5 +23691,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 "Modifica un percorso per equitazione"
@@ -23658,5 +23697,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr "Corsia ciclabile"
@@ -23664,10 +23703,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 "Modifica corsia ciclabile"
 
 #. item "Ways/Cycle Lane" combo "Cycleway"
-#: build/trans_presets.java:615
+#: build/trans_presets.java:625
 msgid "Cycleway"
 msgstr "Pista ciclabile"
@@ -23676,6 +23715,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 "corsia ciclabile"
@@ -23726,27 +23765,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 "tracciato"
@@ -23755,6 +23794,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 "corsia ciclabile contromano"
@@ -23763,6 +23802,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 "pista ciclabile contromano"
@@ -23771,6 +23810,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 "contromano"
@@ -23779,6 +23818,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 "corsia autobus consivisa"
@@ -23787,21 +23826,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 "corsia condivisa"
 
 #. item "Ways/Cycle Lane" combo "Cycleway left"
-#: build/trans_presets.java:616
+#: build/trans_presets.java:626
 msgid "Cycleway left"
 msgstr "Pista ciclabile sinistra"
 
 #. item "Ways/Cycle Lane" combo "Cycleway right"
-#: build/trans_presets.java:617
+#: build/trans_presets.java:627
 msgid "Cycleway right"
 msgstr "Pista ciclabile destra"
 
 #. item "Ways/Cycle Lane" check "Oneway (bicycle)"
-#: build/trans_presets.java:618
+#: build/trans_presets.java:628
 msgid "Oneway (bicycle)"
 msgstr "Senso unico (biciclette)"
@@ -23809,15 +23848,15 @@
 #. <space />
 #. item "Ways/Cycle Lane" label "Edit Highway"
-#: build/trans_presets.java:620
+#: build/trans_presets.java:630
 msgid "Edit Highway"
 msgstr "Modifica strada"
 
 #. item "Ways/Cycle Lane" combo "Highway"
-#: build/trans_presets.java:621
+#: build/trans_presets.java:631
 msgid "Highway"
 msgstr "Strada"
 
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:624
+#: build/trans_presets.java:634
 msgid "Dedicated Cycleway"
 msgstr "Pista ciclabile dedicata"
@@ -23835,11 +23874,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 "Modifica Cycleway"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr "Pedoni"
@@ -23847,5 +23886,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr "Pista pedonale separata e ciclabile"
@@ -23853,5 +23892,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr "Pista combinata pedonale e ciclabile"
@@ -23859,5 +23898,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr "Marciapiede Dedicato"
@@ -23866,5 +23905,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 "Modifica Footway"
@@ -23872,5 +23911,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -23880,10 +23919,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 "Modifica una rampa di scale"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr "Quantità di gradini"
@@ -23891,5 +23930,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"
@@ -23897,5 +23936,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr "Svincolo autostradale"
@@ -23903,10 +23942,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 "Modifica svincolo autostradale"
 
 #. 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
@@ -23915,10 +23954,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:745
+#: build/trans_presets.java:755
 msgid "Exit to"
 msgstr "Uscita"
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:747
+#: build/trans_presets.java:757
 msgid "Services"
 msgstr "Stazione di servizio"
@@ -23926,5 +23965,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 "Modifica stazione di servizio"
@@ -24018,42 +24057,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 "Operatore"
@@ -24062,6 +24101,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 "Bagni pubblici"
@@ -24069,5 +24108,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr "Area di sosta"
@@ -24075,5 +24114,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 "Modifica area di sosta"
@@ -24081,5 +24120,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
@@ -24089,5 +24128,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -24097,5 +24136,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 "Tipo di attraversamento pedonale"
@@ -24104,6 +24143,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 "non presidiato"
@@ -24112,6 +24151,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 "Semaforo"
@@ -24120,6 +24159,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 "isola spartitraffico"
@@ -24128,6 +24167,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 "non marcato"
@@ -24136,6 +24175,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 "Attraversamento a cavallo"
@@ -24144,6 +24183,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 "Attraversamento ciclabile"
@@ -24152,11 +24191,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 "Attraversamento controllato"
 
 #. 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 "Nome del tipo di attraversamento (UK)"
@@ -24164,5 +24203,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 "strisce pedonali"
@@ -24170,5 +24209,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 "attraversamento pedonale regolato da semaforo"
@@ -24176,5 +24215,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 "toucan"
@@ -24182,5 +24221,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 "puffin"
@@ -24188,5 +24227,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 "pegasus"
@@ -24194,5 +24233,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 "tiger"
@@ -24200,5 +24239,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr "Stop"
@@ -24206,5 +24245,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "Mini-rotatoria"
@@ -24215,15 +24254,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 "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "clockwise"
 msgstr "senso orario"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:804
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
@@ -24232,15 +24271,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 "Modifica attraversamento pedonale"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr "Rallentatore del traffico"
@@ -24248,40 +24287,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 "Modifica rallentatore del traffico"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "bump"
 msgstr "dosso"
 
 #. 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 "restringimento"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "cushion"
 msgstr "cuscino berlinese"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "hump"
 msgstr "dosso lungo"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "table"
 msgstr "dosso piatto"
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:820
 msgid "Passing Place"
 msgstr "Slargo per l''incrocio"
@@ -24289,5 +24328,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 "Modifica slargo per l''incrocio"
@@ -24295,5 +24334,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 "Slargo per inversione di marcia"
@@ -24303,5 +24342,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 "Cartello di inizio/fine di centro abitato"
@@ -24309,15 +24348,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 "Modifica cartello di inizio/fine di centro abitato"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:837
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:839
 msgid "Speed Camera"
 msgstr "Rilevatore di velocità"
@@ -24327,5 +24366,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr "Cassone di sabbia"
@@ -24334,17 +24373,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "Guado"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "Modifica guado"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -24352,5 +24380,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 "Modifica passo montano"
@@ -24362,7 +24390,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 "Elevazione"
@@ -24397,18 +24425,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 "Wikipedia"
@@ -24416,5 +24444,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Barriere"
@@ -24422,5 +24450,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr "Colonnina"
@@ -24428,5 +24456,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 "Modifica colonnina"
@@ -24476,27 +24504,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 "Traffico permesso:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:876
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:884
+#: build/trans_presets.java:886
 msgid "Block"
 msgstr "Blocco"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:895
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -24504,10 +24532,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 "Modifica griglia"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -24515,15 +24543,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:910
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:911
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:922
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -24531,5 +24559,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 "Modifica casello (per pedaggio)"
@@ -24537,10 +24565,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -24549,5 +24577,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "Siepe"
@@ -24556,24 +24584,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr "Recinto"
 
-#. <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 "Recinto di rete"
-
-#. <key key="barrier" value="wire_fence" />
-#. item "Barriers/Wood Fence"
-#: build/trans_presets.java:956
-msgid "Wood Fence"
-msgstr "Recinto di legno"
-
-#. <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 "elettrico"
+
+#. 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 "palo"
+
+#. 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 "Muro"
@@ -24581,5 +24628,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -24588,5 +24635,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 "Muro di contenimento"
@@ -24597,15 +24644,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:972
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:973
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr "Cancello"
@@ -24613,50 +24660,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 "Modifica cancello"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1009
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1010
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1021
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1022
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1033
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1034
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
 msgstr "Scaletta"
@@ -24664,25 +24711,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 "Modifica scaletta"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1052
 msgid "Turnstile"
 msgstr "Tornello"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1053
 msgid "Edit Turnstile"
 msgstr "Modifica tornello"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1061
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1062
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
@@ -24692,6 +24739,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 "Acqua"
@@ -24699,5 +24746,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -24705,10 +24752,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 "Modifica un canale di scolo"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr "Fosso"
@@ -24716,10 +24763,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 "Modifica fosso"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1095
 msgid "Stream"
 msgstr "Torrente"
@@ -24727,10 +24774,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 "Modifica un torrente"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "Canale"
@@ -24738,10 +24785,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 "Modifica un canale"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "Fiume"
@@ -24751,5 +24798,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 "Modifica un fiume"
@@ -24757,5 +24804,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Sorgente"
@@ -24763,20 +24810,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 "Modifica sorgente"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "Briglia"
@@ -24784,10 +24831,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 "Modifica briglia"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Diga"
@@ -24795,10 +24842,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 "Modifica una diga"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
 msgstr "Frangiflutti"
@@ -24806,5 +24853,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 "Modifica frangiflutti"
@@ -24814,15 +24861,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1159
 msgid "Basin"
 msgstr "Bacino"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1160
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -24830,15 +24877,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 "Modifica area di riserva d''acqua"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1172
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1173
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -24846,20 +24893,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 "Modifica acqua"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "Terraferma"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "Modifica terraferma"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -24867,10 +24914,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 "Modifica linea di costa"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "Argine"
@@ -24879,5 +24926,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 "Modifica un argine"
@@ -24885,5 +24932,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "Zona umida"
@@ -24894,15 +24941,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 "Modifica zona umida"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "palude"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr "torbiera"
@@ -24915,40 +24962,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 "palude alluvionale"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr "canneto"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr "palude salata"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr "barena"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "mangrovie"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Spiaggia"
@@ -24956,20 +25003,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 "Modifica spiaggia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Baia"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "Rupe"
@@ -24977,15 +25024,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 "Modifica Rupe"
 
 #. group "Shipping"
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1236
 msgid "Shipping"
 msgstr "Navigazione"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1237
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -24993,20 +25040,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 "Modifica terminal traghetti"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "Cargo"
 msgstr "Trasporto"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers"
 msgstr "passeggeri"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "vehicle"
 msgstr "veicoli"
@@ -25092,26 +25139,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 "bicicletta"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "hgv"
 msgstr "veicoli per merci pesanti"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers;vehicle"
 msgstr "passeggeri;veicoli"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1244
 msgid "Ferry Route"
 msgstr "Itinerario traghetto"
@@ -25119,5 +25166,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 "Modifica una linea traghetto"
@@ -25126,15 +25173,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "Passerella"
@@ -25142,10 +25189,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 "Modifica passerella"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -25154,5 +25201,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 "Punto di inversione di marcia"
@@ -25162,5 +25209,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -25170,10 +25217,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 "Modifica una rampa per la messa in acqua di imbarcazioni"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1282
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -25181,10 +25228,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 "Modifica cantiere navale"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1289
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -25192,20 +25239,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 "Modifica una darsena/bacino navale"
 
 #. group "Transport"
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1298
 msgid "Transport"
 msgstr "Trasporto"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1299
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "Ferrovia"
@@ -25213,5 +25260,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 "Modifica una ferrovia"
@@ -25241,7 +25288,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 "Scartamento (mm)"
@@ -25257,8 +25304,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 "Tipi"
@@ -25272,8 +25319,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 "tratto per lo smistamento delle merci"
@@ -25287,8 +25334,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 "tratto parallelo ad una ferrovia principale"
@@ -25302,8 +25349,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 "tratto per una società o ente"
@@ -25316,8 +25363,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 "Elettrificato"
@@ -25330,8 +25377,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 "linea aerea"
@@ -25360,4 +25407,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
@@ -25392,12 +25446,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
@@ -25415,9 +25470,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 "Tensione"
@@ -25430,8 +25485,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 "Frequenza (Hz)"
@@ -25444,8 +25499,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"
@@ -25453,10 +25508,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1313
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. 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 "Modifica una ferrovia a scartamento ridotto"
@@ -25464,5 +25519,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -25470,5 +25525,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 "Modifica una monorotaia"
@@ -25476,10 +25531,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1337
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1338
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
@@ -25487,10 +25542,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1349
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1350
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
@@ -25498,10 +25553,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
@@ -25509,10 +25564,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
@@ -25520,5 +25575,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr "Autobus guidato"
@@ -25526,5 +25581,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 "Modificare autobus guidato"
@@ -25533,10 +25588,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
@@ -25545,10 +25600,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 "Tipi opzionali"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1411
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -25557,5 +25612,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -25564,5 +25619,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr "Attraversamento"
@@ -25572,5 +25627,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -25578,5 +25633,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -25585,5 +25640,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 "Respingente"
@@ -25592,10 +25647,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -25603,5 +25658,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 "Modifica una seggiovia"
@@ -25623,12 +25678,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 "Numero di riferimento"
@@ -25654,14 +25709,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 "Numero di persone per ora"
 
 #. 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 "Numero di persone per seggiolini"
@@ -25679,10 +25734,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 "Tempo medio di percorrenza in minuti"
@@ -25690,5 +25745,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 "Con capotta?"
@@ -25698,6 +25753,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 "Riscaldata?"
@@ -25705,5 +25760,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -25711,5 +25766,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 "Modifica uno ski-lift"
@@ -25717,5 +25772,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "Funivia"
@@ -25723,10 +25778,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 "Modifica funivia"
 
 #. 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 "Numero di persone per veicolo"
@@ -25734,5 +25789,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr "Cabinovia/Ovovia"
@@ -25740,10 +25795,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 "Modifica cabinovia/ovovia"
 
 #. 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 "Numero di persone per cabina"
@@ -25751,5 +25806,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr "Impianto misto"
@@ -25757,10 +25812,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 "Modifica impianto misto (contenente sia cabine che seggiolini)"
 
 #. 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 "Numero di persone per cabina/seggiolini"
@@ -25768,5 +25823,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr "Sciovia ad ancora (T-bar)"
@@ -25774,5 +25829,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 "Modifica sciovia ad ancora (T-bar)"
@@ -25780,5 +25835,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr "Sciovia (J-bar)"
@@ -25786,5 +25841,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 "Modifica sciovia (J-bar)"
@@ -25792,5 +25847,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr "Sciovia a piattello"
@@ -25798,5 +25853,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 "Modifica sciovia a piattello"
@@ -25804,5 +25859,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr "Manovia"
@@ -25810,5 +25865,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 "Modifica manovia"
@@ -25816,5 +25871,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr "Tappeto mobile"
@@ -25822,5 +25877,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 "Modifica tappeto mobile"
@@ -25828,5 +25883,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -25834,5 +25889,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -25842,5 +25897,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -25849,5 +25904,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"
@@ -25855,5 +25910,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -25862,5 +25917,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"
@@ -25878,6 +25933,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 "Parcheggio"
@@ -25886,5 +25941,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 "Modifica parcheggio"
@@ -25892,5 +25947,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 "multi-piano"
@@ -25898,5 +25953,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 "superficie"
@@ -25904,10 +25959,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 "sotterraneo"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr "Parcheggio di interscambio"
@@ -25918,7 +25973,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 "Tariffa"
@@ -25926,25 +25981,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1595
 msgid "Capacity (overall)"
 msgstr "Capacità (totale)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1596
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1597
 msgid "Spaces for Women"
 msgstr "Spazi per le donne"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1598
 msgid "Spaces for Parents"
 msgstr "Spazi per famiglie"
 
 #. 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 "Vedere il Wiki per un''altra capacità:[tipi]=*."
@@ -25952,5 +26007,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -25960,5 +26015,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 "Modifica una stazione di rifornimento"
@@ -25971,117 +26026,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 "Casa produttrice"
 
 #. 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 "Chevron"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Citgo"
 msgstr "Citgo"
 
 #. 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 "Exxon"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Gulf"
 msgstr "Gulf"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Mobil"
 msgstr "Mobil"
 
 #. 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 "Petro-Canada"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Pioneer"
 msgstr "Pioneer"
 
 #. 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 "Shell"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Sunoco"
 msgstr "Sunoco"
 
 #. 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 "Indipendente"
@@ -26174,48 +26229,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 "Orario di apertura"
@@ -26306,47 +26361,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"
@@ -26438,47 +26493,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 "Lu-Ve 08:30-20:00"
@@ -26548,126 +26603,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 "Ma-Do 08:00-15:00;Sa 08:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "With shop"
 msgstr "Con negozio"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "convenience"
 msgstr "drogheria"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "kiosk"
 msgstr "chiosco"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1614
 msgid "Fuel types:"
 msgstr "Tipi di carburante:"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1615
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1616
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1617
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1618
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel per veicoli di trasporto merci pesanti"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1619
 msgid "Octane 91"
 msgstr "91 ottani"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1620
 msgid "Octane 95"
 msgstr "95 ottani"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1621
 msgid "Octane 98"
 msgstr "98 ottani"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1622
 msgid "Octane 100"
 msgstr "100 ottani"
 
 #. 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 (miscela 10% etanolo)"
 
 #. 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 (miscela 85% etanolo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1625
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gas di petrolio liquefatto)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1626
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNC (gas naturale compresso)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1627
 msgid "1/25 mix (mofa/moped)"
 msgstr "Miscela 1/25 (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1628
 msgid "1/50 mix (mofa/moped)"
 msgstr "Miscela 1/50 (mofa/moped)"
@@ -26675,5 +26730,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr "Stazione di ricarica"
@@ -26681,20 +26736,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 "Modifica stazione di ricarica (per automobili elettriche)"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1637
 msgid "Amperage"
 msgstr "Amperaggio"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1639
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
@@ -26702,5 +26757,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr "Concessionaria"
@@ -26708,5 +26763,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 "Modifica concessionaria"
@@ -26714,20 +26769,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 "Autofficina"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1663
 msgid "Tyres"
 msgstr "Pneumatici"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1664
 msgid "Edit Tyres"
 msgstr "Modifica pneumatici"
@@ -26735,5 +26790,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 "Contatto:"
@@ -26777,15 +26832,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 "Numero di telefono"
@@ -26810,14 +26865,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 "Numero di fax"
@@ -26845,15 +26900,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 "Sito Web"
@@ -26878,14 +26933,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 "Indirizzo email"
@@ -26895,6 +26950,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 "Noleggio"
@@ -26903,10 +26958,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 "Modifica noleggio automobili"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr "Condivisione"
@@ -26914,5 +26969,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 "Modifica condivisione automobili"
@@ -26921,16 +26976,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 "Capacità"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1700
 msgid "Edit Motorcycle Parking"
 msgstr "Modifica parcheggio per motociclette"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
 msgstr "Concessionario di motociclette"
@@ -26938,25 +26993,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 "Modifica concessionario di motociclette"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1712
 msgid "independent"
 msgstr "indipendente"
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1715
 msgid "Services:"
 msgstr "Servizi:"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgid "Sale"
 msgstr "Vendita"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "yes"
@@ -26964,5 +27019,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -26970,5 +27025,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -26976,5 +27031,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -26985,6 +27040,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 "casa produttrice"
@@ -26992,35 +27047,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 "esperto"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "Safety inspection"
 msgstr "Revisione veicoli"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "DEKRA"
 msgstr "DEKRA"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "GTÜ"
 msgstr "GTÜ"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "MOT"
 msgstr "MOT"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "TÜV"
 msgstr "TÜV"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1720
 msgid "Parts"
 msgstr "Componenti"
@@ -27030,6 +27085,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 "Abbigliamento"
@@ -27037,10 +27092,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 "Modifica parcheggio per biciclette"
 
+#. 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 "Coperto"
+
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1740
 msgid "Bike Dealer"
 msgstr "Negozio di biciclette"
@@ -27049,35 +27150,35 @@
 #. 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 "Modifica negozio di biciclette"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1746
 msgid "Bicycles are sold"
 msgstr "Vendita biciclette"
 
 #. 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 "Vendita biciclette usate"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Bicycles are repaired"
 msgstr "Riparazione biciclette"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1749
 msgid "Bicycles are rented"
 msgstr "Noleggio biciclette"
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1750
 msgid "Free bicycle pump"
 msgstr "Pompa per biciclette gratuita"
 
 #. 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 ""
@@ -27086,5 +27187,5 @@
 
 #. 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 "Lavaggio biciclette (a pagamento)"
@@ -27093,10 +27194,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 "Modifica noleggio biciclette"
 
 #. 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"
@@ -27104,5 +27205,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -27112,5 +27213,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"
@@ -27118,5 +27219,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -27124,5 +27225,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -27130,5 +27231,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 "Modifica stazione non presidiata"
@@ -27136,5 +27237,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -27143,5 +27244,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 "Modifica fermata del tram"
@@ -27149,5 +27250,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -27156,5 +27257,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 "Modifica una piattaforma ferroviaria"
@@ -27166,5 +27267,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 "Riferimento (numero del tracciato)"
@@ -27173,11 +27274,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 "Area"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -27186,5 +27287,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 "Modifica ingresso metropolitana"
@@ -27192,5 +27293,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 "Sedia a rotelle"
@@ -27199,5 +27300,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -27206,5 +27307,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 "Modifica una stazione degli autobus"
@@ -27212,5 +27313,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "Fermata dell''autobus"
@@ -27220,5 +27321,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 "Modifica fermata dell''autobus"
@@ -27227,6 +27328,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
@@ -27238,10 +27339,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 "Panchina"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
 msgstr "Pavimentazione tattile"
@@ -27249,10 +27350,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1841
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -27260,10 +27361,10 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1849
 msgid "Ticket Machine"
 msgstr "Distributore automatico titoli di viaggio"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1855
 msgid "Reference Number"
 msgstr "Numero di riferimento"
@@ -27272,6 +27373,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 "Monete"
@@ -27280,6 +27381,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 "Banconote"
@@ -27288,6 +27389,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 "Portafogli elettronici e carte di debito"
@@ -27296,6 +27397,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 "Carte di debito"
@@ -27304,6 +27405,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 "Carte di credito"
@@ -27311,10 +27412,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 "Conto o carta fedeltà"
 
 #. item "Taxi"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Taxi"
 msgstr "Taxi"
@@ -27322,5 +27423,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 "Stazione dei taxi"
@@ -27328,10 +27429,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "Aeroporto"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
 msgstr "Terreno aeroportuale"
@@ -27339,5 +27440,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 "Modifica terreno aeroportuale"
@@ -27345,10 +27446,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"
@@ -27357,5 +27458,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr "Pista di decollo/atterraggio"
@@ -27363,5 +27464,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 "Modifica pista di decollo/atterraggio"
@@ -27369,5 +27470,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr "Pista di rullaggio"
@@ -27375,5 +27476,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 "Modifica pista di rullaggio"
@@ -27381,5 +27482,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr "Eliporto"
@@ -27387,5 +27488,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 "Modifica eliporto"
@@ -27395,5 +27496,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 "Parcheggio aeromobili"
@@ -27403,5 +27504,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"
@@ -27412,6 +27513,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 "Torre radio"
@@ -27421,5 +27522,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 "Manica a vento"
@@ -27428,5 +27529,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr "Terminale"
@@ -27434,10 +27535,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 "Modifica terminal aeroportuale"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1935
 msgctxt "airport"
 msgid "Gate"
@@ -27446,15 +27547,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 "Modifica varco terminal aeroportuale"
 
 #. 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 "Strutture"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1944
 msgid "Accommodation"
 msgstr "Accoglienza"
@@ -27466,5 +27567,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"
@@ -27473,5 +27574,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 "Modifica hotel"
@@ -27485,8 +27586,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 "Stelle"
@@ -27522,12 +27623,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 "Accesso ad Internet"
@@ -27548,12 +27649,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 "wlan"
@@ -27574,12 +27675,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 "via cavo"
@@ -27606,12 +27707,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 aeroportuale"
@@ -27632,12 +27733,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 "Tariffa di accesso ad Internet"
@@ -27660,12 +27761,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 "Zona fumatori"
@@ -27687,12 +27788,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 "dedicata"
@@ -27714,12 +27815,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 "separata"
@@ -27741,17 +27842,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 "isolata"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1964
 msgid "Motel"
 msgstr "Motel"
@@ -27759,20 +27860,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 "Modifica Motel"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -27780,10 +27881,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 "Modifica casetta (chalet)"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
 msgstr "Ostello"
@@ -27791,15 +27892,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 "Modifica ostello"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2033
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2034
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
@@ -27807,10 +27908,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
@@ -27818,30 +27919,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 "Numero di posti"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "Requires a fee"
 msgstr "Richiede un pedaggio"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "interval"
 msgstr "intervallo"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2064
 msgid "Power supply"
 msgstr "Fornitura di energia elettrica"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2065
 msgid "Tents allowed"
 msgstr "Tende ammesse"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2072
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -27849,10 +27950,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 "Modifica campeggio"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -27863,5 +27964,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 "Ristorante"
@@ -27869,5 +27970,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 "Modifica ristorante"
@@ -27876,6 +27977,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 "Cucina"
@@ -27883,5 +27984,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 "italiana"
@@ -27889,5 +27990,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 "cinese"
@@ -27895,5 +27996,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"
@@ -27901,5 +28002,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 "hamburger"
@@ -27907,5 +28008,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 "greca"
@@ -27913,5 +28014,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 "tedesca"
@@ -27919,5 +28020,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 "indiana"
@@ -27925,5 +28026,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 "provinciale"
@@ -27931,5 +28032,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"
@@ -27937,5 +28038,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 "turca"
@@ -27943,5 +28044,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 "asiatica"
@@ -27949,5 +28050,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 "tailandese"
@@ -27955,5 +28056,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 "messicana"
@@ -27961,5 +28062,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 "giapponese"
@@ -27967,5 +28068,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 "francese"
@@ -27973,5 +28074,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 "tramezzino"
@@ -27979,5 +28080,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"
@@ -27985,10 +28086,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 "Microbirrificio"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2112
 msgid "Fast Food"
 msgstr "Fast food"
@@ -27996,20 +28097,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 "Modifica fast food"
 
 #. 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"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "chicken"
 msgstr "pollo"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2131
 msgid "Food Court"
 msgstr "Mensa self service"
@@ -28017,10 +28118,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 "Modifica mensa self service"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2148
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -28028,15 +28129,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 "Caffetteria"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "ice_cream"
 msgstr "gelato"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2167
 msgid "Pub"
 msgstr "Pub"
@@ -28044,20 +28145,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 "Modifica Pub"
 
 #. 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 "Modifica Biergarten"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr "Bar"
@@ -28065,10 +28166,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 "Modifica Bar"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2219
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -28076,25 +28177,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 "Modifica club notturno"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Turismo"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -28102,10 +28203,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 "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
@@ -28113,20 +28214,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "topografico"
@@ -28159,32 +28260,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 "strada"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr "schema"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr "luogo"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "città"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "provincia"
@@ -28193,6 +28294,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 "Descrizione più specifica"
@@ -28202,5 +28303,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 "Itinerari segnalati per:"
@@ -28208,5 +28309,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 "Percorso escursionistico"
@@ -28215,6 +28316,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 "Ciclismo"
@@ -28222,5 +28323,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 "Mountain bike"
@@ -28229,6 +28330,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 "Sci"
@@ -28236,5 +28337,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 "Equitazione"
@@ -28242,50 +28343,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 "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "notice"
 msgstr "avviso"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "history"
 msgstr "storia"
 
 #. 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 "fauna"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2282
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2297
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -28293,10 +28394,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 "Descrizione dettagliata"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr "Audio-guida"
@@ -28304,25 +28405,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 "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "Svago"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Cinema"
@@ -28331,10 +28432,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 "Modifica Cinema"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Zoo"
@@ -28343,10 +28444,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 "Modifica zoo"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr "Area per cani"
@@ -28355,45 +28456,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 "Modifica area per cani"
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Barrier"
 msgstr "Barriera"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "fence"
 msgstr "recinzione"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "wall"
 msgstr "muro"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2355
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr "Sauna"
@@ -28403,5 +28504,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 "Modifica sauna"
@@ -28429,20 +28530,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 "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Access"
 msgstr "Permesso di accesso"
@@ -28450,5 +28551,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Parco giochi"
@@ -28456,15 +28557,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 "Modifica parco giochi"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
@@ -28472,10 +28573,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 "Caminetto"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
 msgstr "Griglia pubblica"
@@ -28483,15 +28584,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 "Modifica griglia pubblica"
 
-#. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2396
-msgid "Covered"
-msgstr "Coperto"
-
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgctxt "grill"
 msgid "Fuel"
@@ -28499,30 +28595,25 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "charcoal"
 msgstr "carbone"
 
-#. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
-msgid "electric"
-msgstr "elettrico"
-
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2400
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. group "Culture"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2406
 msgid "Culture"
 msgstr "Cultura"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Museum"
 msgstr "Museo"
@@ -28530,10 +28621,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 "Modifica museo"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Teatro"
@@ -28542,10 +28633,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 "Modifica Teatro"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Biblioteca"
@@ -28554,10 +28645,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 "Modifica biblioteca"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -28565,10 +28656,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 "Modifica centro d''arte"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Opera d''arte"
@@ -28576,10 +28667,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 "Modifica opera d''arte"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -28589,5 +28680,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 "Modifica Luogo di culto"
@@ -28596,6 +28687,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 "Religione"
@@ -28604,6 +28695,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"
@@ -28612,6 +28703,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 "Buddista"
@@ -28620,6 +28711,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 "Cristiana"
@@ -28628,6 +28719,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 "Induista"
@@ -28636,6 +28727,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 "Giainista"
@@ -28644,6 +28735,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 "Ebraica"
@@ -28652,6 +28743,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 "Mussulmana"
@@ -28660,6 +28751,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"
@@ -28668,6 +28759,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 "Spiritualista"
@@ -28676,6 +28767,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"
@@ -28684,6 +28775,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 "Unitariana"
@@ -28692,6 +28783,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 "Zoroastrista"
@@ -28700,6 +28791,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 "Denominazione"
@@ -28708,6 +28799,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 "Anglicana"
@@ -28716,6 +28807,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 "Battista"
@@ -28724,6 +28815,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 "Cattolica"
@@ -28732,6 +28823,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 "Evangelica"
@@ -28740,6 +28831,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 "Testimoni di Geova"
@@ -28748,6 +28839,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 "Luterana"
@@ -28756,6 +28847,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"
@@ -28764,6 +28855,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 "Mormone"
@@ -28772,6 +28863,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 "Ortodossa"
@@ -28780,6 +28871,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 "Pentecostale"
@@ -28788,6 +28879,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 "Prebiteriana"
@@ -28796,6 +28887,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"
@@ -28804,6 +28895,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 "Quacchera"
@@ -28812,6 +28903,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 "Sciita"
@@ -28820,36 +28911,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 "Sunnita"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2451
 msgid "Service Times"
 msgstr "Orari celebrazioni"
 
 #. 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 "Do 10:00"
 
 #. 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 "Do 10:30"
 
 #. 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 "Do 11:00"
 
 #. 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 "Orari di apertura per visite"
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Recording Studio"
 msgstr "Studio di registrazione"
@@ -28857,15 +28948,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 "Modifica studio di registrazione"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "audio"
 msgstr "audio"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "video"
 msgstr "video"
@@ -28873,5 +28964,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 "Edificio pubblico"
@@ -28879,10 +28970,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 "Modifica edificio pubblico"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Municipio"
@@ -28890,5 +28981,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 "Modifica municipio"
@@ -28897,10 +28988,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 "Centro civico"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2488
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -28908,10 +28999,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 "Modifica ambasciata"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -28920,10 +29011,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 "Modifica tribunale"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Prigione"
@@ -28932,10 +29023,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 "Modifica Prigione"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "Polizia"
@@ -28945,10 +29036,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 "Modifica Polizia"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -28957,10 +29048,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 "Modifica vigili del fuoco"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -28968,25 +29059,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 "Modifica Ufficio Postale"
 
 #. group "Education"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2531
 msgid "Education"
 msgstr "Istruzione"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2532
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "Scuola"
@@ -28994,10 +29085,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 "Modifica scuola"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Università"
@@ -29005,10 +29096,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 "Modifica Università"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "Scuola superiore"
@@ -29016,10 +29107,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 "Modifica scuola superiore"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr "Autoscuola"
@@ -29027,20 +29118,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 "Modifica autoscuola"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2562
 msgid "License Classes"
 msgstr "Categorie di patente"
 
 #. group "Health"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Health"
 msgstr "Salute"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Ospedale"
@@ -29048,10 +29139,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 "Modifica Ospedale"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -29059,25 +29150,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 "Modifica ambulatorio"
 
 #. 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 "Modifica dentista"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2585
 msgid "Nursing Home"
 msgstr "Struttura di assistenza continua (casa di riposo...)"
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2586
 msgid "Edit Nursing Home"
 msgstr "Modifica struttura di assistenza continua (casa di riposo...)"
@@ -29085,5 +29176,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -29091,5 +29182,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 "Modifica Farmacia"
@@ -29097,10 +29188,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2596
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2600
 msgid "Hearing Aids"
 msgstr "Centro per l''udito"
@@ -29108,5 +29199,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 "Modifica centro per l''udito"
@@ -29114,5 +29205,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -29120,5 +29211,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 "Modifica culla per la vita"
@@ -29126,5 +29217,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -29133,5 +29224,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 "Modifica colonnina SOS"
@@ -29140,15 +29231,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 "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2625
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. 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 "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -29157,5 +29248,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -29164,10 +29255,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 "Modifica veterinario"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr "limitato"
@@ -29175,15 +29266,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 "Nota"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Telefono"
@@ -29192,15 +29283,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 "Modifica Telefono"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr "Orologio"
@@ -29209,5 +29300,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 "Modifica orologio"
@@ -29217,5 +29308,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 "Schermo"
@@ -29223,5 +29314,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"
@@ -29230,5 +29321,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"
@@ -29236,5 +29327,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -29242,5 +29333,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -29248,60 +29339,55 @@
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "Support"
 msgstr "Supporto"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
-msgid "pole"
-msgstr "palo"
-
-#. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "wall_mounted"
 msgstr "a muro"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "billboard"
 msgstr "tabellone"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "Visibility/readability"
 msgstr "Visibilità/leggibilità"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 5m)"
 msgstr "(fino a 5m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 20m)"
 msgstr "(fino a 20m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(more than 20m)"
 msgstr "(più di 20m)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2679
 msgid "Shows current date"
 msgstr "Visualizza la data corrente"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2680
 msgid "Shows temperature"
 msgstr "Visualizza la temperatura"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2681
 msgid "Shows barometric pressure"
 msgstr "Visualizza la pressione atmosferica"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2682
 msgid "Shows humidity"
 msgstr "Visualizza l''umidità"
@@ -29309,5 +29395,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -29316,5 +29402,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 "Modifica Stazione di riciclaggio"
@@ -29322,40 +29408,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "container"
 msgstr "contenitore"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "centre"
 msgstr "centro"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2698
 msgid "Waste Basket"
 msgstr "Cestino della spazzatura"
@@ -29363,5 +29449,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 "Modifica cestino della spazzatura"
@@ -29370,30 +29456,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2707
 msgid "Backrest"
 msgstr "Schienale"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "stone"
 msgstr "pietra"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "plastic"
 msgstr "plastica"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "black"
@@ -29401,5 +29487,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -29407,5 +29493,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -29413,5 +29499,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -29419,5 +29505,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -29425,5 +29511,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -29431,5 +29517,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -29437,20 +29523,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2710
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgid "Type of shelter"
 msgstr "Tipo di pensilina/ricovero"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -29458,5 +29544,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"
@@ -29464,5 +29550,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"
@@ -29470,5 +29556,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"
@@ -29476,10 +29562,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -29488,10 +29574,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 "Modifica Albero"
 
 #. 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"
@@ -29499,20 +29585,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr "mezzo"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr "completo"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "Nascondi"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr "Blocco"
@@ -29520,5 +29606,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -29527,10 +29613,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 "Modifica acqua potabile"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr "Pompa antincendio"
@@ -29539,5 +29625,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 "Modifica pompa antincendio"
@@ -29545,5 +29631,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"
@@ -29551,5 +29637,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -29557,5 +29643,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -29563,16 +29649,16 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pond"
 msgstr "non pressurizzato"
 
-#. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2740
-msgid "Diameter"
-msgstr "Diametro"
+#. 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"
@@ -29580,5 +29666,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"
@@ -29586,5 +29672,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -29592,26 +29678,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 "prato"
 
-#. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2747
-msgid "Pressure"
-msgstr "Pressione"
-
-#. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2747
-msgid "xx l/min"
-msgstr "xx l/min"
-
-#. 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 "portata"
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2749
 msgid "Count"
 msgstr "Numero di idranti"
@@ -29619,20 +29700,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 "Strutture sportive"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -29646,6 +29727,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 "seleziona uno sport:"
@@ -29991,34 +30072,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"
@@ -30028,6 +30109,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 "polivalente"
@@ -30037,6 +30118,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 "tiro con l''arco"
@@ -30046,6 +30127,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 "atletica"
@@ -30055,6 +30136,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 "football americano"
@@ -30064,6 +30145,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 "football_australiano"
@@ -30073,6 +30154,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"
@@ -30082,6 +30163,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 "pallacanestro"
@@ -30091,6 +30172,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"
@@ -30100,6 +30181,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 "boccie"
@@ -30109,6 +30190,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 "calcio canadese"
@@ -30118,6 +30199,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 "canoa"
@@ -30127,6 +30208,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 "arrampicata"
@@ -30136,6 +30217,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 "cricket"
@@ -30145,6 +30226,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 "reti_cricket"
@@ -30154,6 +30235,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 "croquet"
@@ -30163,6 +30244,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 "ciclismo"
@@ -30172,6 +30253,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 "cinodromo"
@@ -30181,6 +30262,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 "sport equestri"
@@ -30190,6 +30271,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 "calcio gaelico"
@@ -30199,6 +30280,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"
@@ -30208,6 +30289,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 "ginnastica"
@@ -30217,6 +30298,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 "hockey"
@@ -30226,6 +30307,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 "ippodromo"
@@ -30235,6 +30316,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 "autodromo"
@@ -30244,6 +30325,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"
@@ -30253,6 +30334,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 "racchette"
@@ -30262,6 +30343,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 a 13"
@@ -30271,6 +30352,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 a 15"
@@ -30280,6 +30361,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 "poligono_di_tiro"
@@ -30289,6 +30370,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 "skateboard"
@@ -30298,6 +30379,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 "pattinaggio"
@@ -30307,6 +30388,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 "comprensorio_sciistico"
@@ -30316,6 +30397,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 "calcio"
@@ -30325,6 +30406,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 "piscina"
@@ -30334,6 +30415,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"
@@ -30343,71 +30424,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 "Centro sportivo"
 
 #. 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 "Modifica centro sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. 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 "Modifica campo da golf"
 
 #. 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 "Modifica minigolf"
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "Discipline sportive"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2805
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -30455,25 +30536,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 "tipo"
@@ -30523,26 +30604,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 "campo sportivo"
@@ -30592,26 +30673,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 "centro sportivo"
@@ -30656,149 +30737,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 "stadio"
 
 #. 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 "Modifica bowling"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -30806,60 +30887,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 "Modificare Sci"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "Sci alpino"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "Sci nordico"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
 msgstr "snow_park"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "principante"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "facile"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
 msgstr "avanzato"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "expert"
 msgstr "esperto"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "freeride"
 msgstr "freeride"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -30867,105 +30948,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 "Modifica poligono di tiro"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "Discipline sportive (palla)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "American Football"
 msgstr "Football americano"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit American Football"
 msgstr "Modifica football americano"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2925
 msgid "Canadian Football"
 msgstr "Calcio canadese"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Edit Canadian Football"
 msgstr "Modifica calcio canadese"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2931
 msgid "Gaelic Football"
 msgstr "Calcio gaelico"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Edit Gaelic Football"
 msgstr "Modifica calcio gaelico"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2937
 msgid "Rugby League"
 msgstr "Rugby a 13 (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 "Modifica rugby a 13 (rugby league)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2943
 msgid "Rugby Union"
 msgstr "Rugby a 15 (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 "Modifica rugby a 15 (rugby union)"
 
 #. 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 "Modifica Baseball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr "Pallavolo"
@@ -30973,10 +31054,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 "Modifica pallavolo"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "Beachvolleyball"
 msgstr "Beach volley"
@@ -30984,120 +31065,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 "Modifica beach volley"
 
 #. 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 "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr "campo_da_golf"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
 #. 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 "Modifica Pelota"
 
 #. 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 "Modifica racquet"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
 #. 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 "Modifica Tennis"
@@ -31105,40 +31186,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 "Sport motoristico"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3048
 msgid "Edit Motorsport"
 msgstr "Modifica sport motoristico"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3053
 msgid "Karting"
 msgstr "Kart"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3054
 msgid "Edit Karting"
 msgstr "Modifica kart"
 
 #. 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 "Modifica motocross"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3065
 msgid "Safety Training"
 msgstr "Corso di guida sicura"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3066
 msgid "Edit Safety Training"
 msgstr "Modifica corso di guida sicura"
@@ -31146,20 +31227,20 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3072
 msgid "Model Aerodrome"
 msgstr "Aerodromo per modellini"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3073
 msgid "Edit Model Aerodrome"
 msgstr "Modifica aerodromo per modellini"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3078
 msgid "RC Car"
 msgstr "Automobili radiocomandate"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3079
 msgid "Edit RC Car"
 msgstr "Modifica automobili radiocomandate"
@@ -31167,10 +31248,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 "Artificiale"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "Palazzo"
@@ -31178,25 +31259,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 "Torre"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "communication"
 msgstr "telecomunicazioni"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "observation"
 msgstr "osservazione"
@@ -31205,5 +31286,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 "Altezza (metri)"
@@ -31211,5 +31292,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr "Pennone"
@@ -31219,15 +31300,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr "Ciminiera"
@@ -31235,10 +31316,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 "Modifica ciminiera"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3120
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -31246,20 +31327,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 "Modifica mulino a vento"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -31268,5 +31349,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 "Modifica conduttura"
@@ -31310,8 +31391,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
@@ -31321,10 +31402,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 "gas"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr "calore"
@@ -31332,20 +31413,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 "petrolio"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "sewage"
 msgstr "liquami"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgid "Location"
 msgstr "Posizione"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underwater"
@@ -31353,5 +31434,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"
@@ -31359,5 +31440,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Gru permanente"
@@ -31365,10 +31446,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 "Modifica gru permanente"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr "Tunnel verticale (miniera)"
@@ -31377,25 +31458,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 "Modifica tunnel verticale (miniera)"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "Function"
 msgstr "Funzione"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "winding"
 msgstr "trasporto"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "air"
 msgstr "aerazione"
 
 #. 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 "Profondità in metri"
@@ -31403,5 +31484,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 "Materiale estratto"
@@ -31409,5 +31490,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 "aggregati"
@@ -31415,5 +31496,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 "bauxite"
@@ -31422,6 +31503,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 "carbone"
@@ -31429,5 +31510,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 "rame"
@@ -31435,5 +31516,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 "pietra"
@@ -31441,5 +31522,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 "oro"
@@ -31447,5 +31528,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 "ilmenite"
@@ -31453,5 +31534,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 "minerali ferrosi"
@@ -31459,5 +31540,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 "piombo"
@@ -31465,5 +31546,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 "calcare"
@@ -31471,5 +31552,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 "nichel"
@@ -31477,5 +31558,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 "rutilo"
@@ -31483,5 +31564,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 "sale"
@@ -31489,5 +31570,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 "argento"
@@ -31495,5 +31576,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 "stagno"
@@ -31501,5 +31582,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 "zinco"
@@ -31507,10 +31588,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 "zircone"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3156
 msgid "Visible Headframe"
 msgstr "Struttura di entrata visibile"
@@ -31518,10 +31599,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 "In disuso"
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3159
 msgid "Adit"
 msgstr "Ingresso di una galleria mineraria"
@@ -31529,10 +31610,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 "Modifica ingresso di una galleria mineraria"
 
 #. 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 "Lunghezza in metri"
@@ -31540,15 +31621,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. 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 "Modifica torre idrica"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr "Impianto idrico"
@@ -31556,10 +31637,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 "Modifica impianto idrico"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3183
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -31569,10 +31650,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 "Modifica depuratore acqua"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr "Mulino ad acqua"
@@ -31580,10 +31661,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 "Modifica mulino ad acqua"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3198
 msgid "Fountain"
 msgstr "Fontana"
@@ -31592,10 +31673,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 "Modifica Fontana"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr "Pozzo"
@@ -31603,5 +31684,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 "Modifica pozzo"
@@ -31609,5 +31690,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Faro"
@@ -31615,5 +31696,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 "Modifica faro"
@@ -31621,10 +31702,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 "Modifica torre radio"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3224
 msgid "Street Lamp"
 msgstr "Lampione"
@@ -31632,5 +31713,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 "Modifica lampione"
@@ -31639,15 +31720,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 "Orario di accensione"
 
 #. 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 "Lu-Ve 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 "Stazione di misurazione"
@@ -31655,55 +31736,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 "Modifica stazione di misurazione"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "Measurement"
 msgstr "Misurazione"
 
 #. 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 "particolato"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "seismic"
 msgstr "sismica"
 
 #. 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 "livello delle acque"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "weather"
 msgstr "meteo"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "Recording"
 msgstr "Registrazione"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "manually"
 msgstr "manuale"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "automated"
 msgstr "automatica"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "remote"
 msgstr "remota"
 
 #. 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"
@@ -31711,5 +31792,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -31717,10 +31798,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 "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3248
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -31728,30 +31809,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 "Modifica telecamera di sorveglianza"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "indoor"
 msgstr "interno"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "outdoor"
 msgstr "esterno"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "public"
 msgstr "pubblico"
 
 #. group "Power"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3256
 msgid "Power"
 msgstr "Potenza"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3257
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -31761,140 +31842,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 "Modifica centrale elettrica"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biofuel"
 msgstr "bio-carburanti"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biogas"
 msgstr "biogas"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biomass"
 msgstr "biomasse"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "diesel"
 msgstr "diesel"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "gasoline"
 msgstr "benzina"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "geothermal"
 msgstr "geotermica"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "hydro"
 msgstr "idroelettrica"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "fissione nucleare"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "osmotic"
 msgstr "osmotico"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "solar"
 msgstr "solare"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "tidal"
 msgstr "flusso di marea"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "waste"
 msgstr "rifiuti"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wave"
 msgstr "moto ondoso"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wind"
 msgstr "eolica"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "Method"
 msgstr "Metodo"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "anaerobic_digestion"
 msgstr "digestione anaerobica"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "combustion"
 msgstr "combustione"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "dam"
 msgstr "diga"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fission"
 msgstr "fissione"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fusion"
 msgstr "fusione"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "gasification"
 msgstr "gassificazione"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumped-storage"
 msgstr "idroelettrico con accumulazione"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumping"
 msgstr "pompaggio"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pyrolysis"
 msgstr "pirolisi"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "run-of-the-river"
 msgstr "flusso fluviale"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "thermal"
 msgstr "termica"
@@ -31902,10 +31983,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 "Forme di uscita dell'energia"
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3268
 msgid "electricity"
 msgstr "elettricità"
@@ -31920,9 +32001,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 "2 W"
@@ -31937,9 +32018,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 "3 kW"
@@ -31954,9 +32035,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 "5 MW"
@@ -31971,54 +32052,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: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 "7 GW"
 msgstr "7 GW"
 
 #. item "Power/Power Generator" combo "hot water"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3269
 msgid "hot water"
 msgstr "acqua calda"
 
 #. item "Power/Power Generator" combo "hot air"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3270
 msgid "hot air"
 msgstr "aria calda"
 
 #. item "Power/Power Generator" combo "cold water"
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3271
 msgid "cold water"
 msgstr "acqua fredda"
 
 #. item "Power/Power Generator" combo "cold air"
-#: build/trans_presets.java:3271
+#: build/trans_presets.java:3272
 msgid "cold air"
 msgstr "aria fredda"
 
 #. item "Power/Power Generator" combo "compressed air"
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3273
 msgid "compressed air"
 msgstr "aria compressa"
 
 #. item "Power/Power Generator" combo "steam"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3274
 msgid "steam"
 msgstr "vapore"
 
 #. item "Power/Power Generator" combo "vacuum"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3275
 msgid "vacuum"
 msgstr "vuoto"
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 msgid "battery charging"
 msgstr "ricarica batterie"
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3278
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -32027,10 +32108,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 "Modifica stazione elettrica"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -32039,5 +32120,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 "Modifica sottostazione elettrica"
@@ -32045,10 +32126,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 "Riferimento elettrodotto"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr "Armadio di derivazione"
@@ -32057,5 +32138,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 "Modifica armadio di derivazione"
@@ -32063,5 +32144,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -32072,5 +32153,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 "Modifica pilone (elettricità)"
@@ -32078,10 +32159,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 "Riferimento torre"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3312
+#: build/trans_presets.java:3313
 msgid "Pole"
 msgstr "Palo"
@@ -32090,5 +32171,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 "Modifica palo"
@@ -32096,10 +32177,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 "Riferimento palo"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3320
 msgid "Power Line"
 msgstr "Elettrodotto"
@@ -32108,15 +32189,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 "Modifica elettrodotto"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "line"
@@ -32124,5 +32205,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"
@@ -32130,40 +32211,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3329
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. 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 "Numero di fili (conduttori) per cavo elettrico"
 
 #. 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 "singolo"
 
 #. 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 "doppio"
 
 #. 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 "triplo"
 
 #. 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 "quadruplo"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3332
+#: build/trans_presets.java:3333
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Castello"
@@ -32172,20 +32253,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 "Modifica castello"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -32194,10 +32275,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 "Modifica sito archeologico"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -32205,10 +32286,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 "Modifica campo di battaglia"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -32216,5 +32297,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 "Modifica sito paleontologico"
@@ -32222,15 +32303,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3370
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "Memoriale"
@@ -32238,60 +32319,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 "Modifica memoriale"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3398
 msgid "Food"
 msgstr "Cibo"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3399
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
 msgstr "Drogheria"
@@ -32299,10 +32380,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 "Modifica drogheria"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -32310,5 +32391,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 "Modifica chiosco"
@@ -32316,5 +32397,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Panificio"
@@ -32322,10 +32403,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 "Modifica Panificio"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Macellaio"
@@ -32333,10 +32414,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 "Modifica Macellaio"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr "Pescheria"
@@ -32344,10 +32425,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 "Modifica pescheria"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3443
 msgid "Deli (Fine Food)"
 msgstr "Cibi e bevante pregiate"
@@ -32355,10 +32436,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 "Modifica cibi e bevante pregiate"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3451
+#: build/trans_presets.java:3452
 msgid "Confectionery"
 msgstr "Pasticceria"
@@ -32366,5 +32447,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 "Modifica pasticceria"
@@ -32372,5 +32453,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr "Mercato"
@@ -32378,10 +32459,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 "Modifica mercato"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3468
+#: build/trans_presets.java:3469
 msgid "Greengrocer"
 msgstr "Fruttivendolo"
@@ -32389,15 +32470,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 "Modifica fruttivendolo"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3477
+#: build/trans_presets.java:3478
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
@@ -32405,5 +32486,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -32411,25 +32492,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 "Modifica negozio di alcolici (non in Italia)"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3491
+#: build/trans_presets.java:3492
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3493
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3501
 msgid "Edit Clothes Shop"
 msgstr "Modifica negozio di abbigliamento"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3505
+#: build/trans_presets.java:3506
 msgid "Boutique"
 msgstr "Boutique"
@@ -32437,20 +32518,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 "Modifica boutique"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3514
+#: build/trans_presets.java:3515
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "Sport all''aperto"
@@ -32458,10 +32539,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 "Modifica sport all''aperto"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
@@ -32469,5 +32550,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -32475,10 +32556,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 "Modifica Lavanderia a secco"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -32486,20 +32567,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 "Modifica lavanderia"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3548
+#: build/trans_presets.java:3549
 msgid "Tailor"
 msgstr "Sarto"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3550
 msgid "Edit Tailor"
 msgstr "Modifica sarto"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3554
+#: build/trans_presets.java:3555
 msgid "Fabric"
 msgstr "Merceria"
@@ -32507,35 +32588,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 "Modifica merceria"
 
 #. group "Electronic"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3565
 msgid "Electronic"
 msgstr "Elettronica"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3566
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "Modifica negozio di elettronica"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr "Telefoni cellulari"
@@ -32543,10 +32624,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 "Modifica telefoni cellulari"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3587
 msgid "Vacuum Cleaner"
 msgstr "Aspirapolveri"
@@ -32554,35 +32635,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 "Modifica aspirapolveri"
 
 #. 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 "Modifica negozio di Hi-Fi"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3602
 msgid "Video"
 msgstr "Videoteca"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:3603
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
 #. group "Cash"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3609
 msgid "Cash"
 msgstr "Contanti"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Banca"
@@ -32590,5 +32671,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 "Modifica banca"
@@ -32596,10 +32677,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 "Bancomat"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -32607,5 +32688,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 "Modifica cambiavalute"
@@ -32613,10 +32694,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 "Modifica bancomat"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr "Grande magazzino"
@@ -32624,10 +32705,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 "Modifica grande magazzino"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3642
+#: build/trans_presets.java:3643
 msgid "Mall"
 msgstr "Centro commerciale"
@@ -32635,5 +32716,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 "Modifica centro commerciale"
@@ -32641,35 +32722,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr "Articoli di pulizia e bellezza"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
 msgstr "Modifica negozio di articoli di pulizia e bellezza"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
 msgstr "Ottico"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr "Gioielleria"
@@ -32677,10 +32758,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 "Modifica gioielleria"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3679
+#: build/trans_presets.java:3680
 msgid "Erotic"
 msgstr "Sexy shop"
@@ -32688,5 +32769,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 "Modifica sexy shop"
@@ -32694,5 +32775,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "Fiorista"
@@ -32700,10 +32781,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 "Modifica Fiorista"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -32711,5 +32792,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 "Modifica giardinaggio"
@@ -32717,5 +32798,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -32723,10 +32804,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 "Modifica negozio Fai-da-te"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -32734,10 +32815,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 "Modifica Negozio di Ferramenta"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3719
 msgid "Paint"
 msgstr "Vernici"
@@ -32745,5 +32826,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 "Modifica vernici"
@@ -32751,15 +32832,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
 msgstr "Cucine"
@@ -32767,10 +32848,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 "Modifica cucine"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3743
+#: build/trans_presets.java:3744
 msgid "Curtain"
 msgstr "Tende"
@@ -32778,10 +32859,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 "Modifica tende"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3752
+#: build/trans_presets.java:3753
 msgid "Frame"
 msgstr "Cornici"
@@ -32789,5 +32870,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 "Modifica cornici"
@@ -32795,15 +32876,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
 msgstr "Copisteria"
@@ -32811,15 +32892,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 "Modifica copisteria"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3778
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3779
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
@@ -32827,15 +32908,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr "Strumenti musicali"
@@ -32843,20 +32924,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 "Modifica strumenti musicali"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3800
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
 msgstr "Articoli a basso costo (\"tutto a ...\")"
@@ -32864,10 +32945,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 "Modifica articoli a basso costo (\"tutto a ...\")"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3815
+#: build/trans_presets.java:3816
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -32875,5 +32956,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 "Modifica Distributore automatico"
@@ -32881,180 +32962,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 "Distributore automatico"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "biglietti per il trasporto pubblico"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "orari del trasporto pubblico"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr "biglietti per il parcheggio"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "cibo"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "bevande"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "dolci"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "sigarette"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr "fotografie"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "cibo per animali"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "giornali"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "giocattoli"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "francobolli"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "schede SIM"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "ricariche telefoniche"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "buoni"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "bicycle_tube"
 msgstr "camere d''aria per biciclette"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "condoms"
 msgstr "preservativi"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "assorbenti"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "excrement_bags"
 msgstr "sacchetti per escrementi"
 
 #. 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 "Confini"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr "Politico"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. 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 "Modifica Confine Parco Nazionale"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Luoghi"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. 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"
@@ -33062,10 +33143,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -33073,25 +33154,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -33099,5 +33180,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
@@ -33106,10 +33187,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "Paese"
@@ -33117,10 +33198,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 "Modifica paese"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Quartiere"
@@ -33128,35 +33209,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 "Modifica quartiere"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3938
+#: build/trans_presets.java:3939
 msgid "Isolated Dwelling"
 msgstr "Insediamento rurale isolato"
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3939
+#: build/trans_presets.java:3940
 msgid "Edit Isolated Dwelling"
 msgstr "Modifica insediamento rurale isolato"
@@ -33164,5 +33245,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
@@ -33170,10 +33251,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 "Modifica località (luogo con nome, non popolato)"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3956
+#: build/trans_presets.java:3957
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -33181,10 +33262,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 "Modifica picco montuoso"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -33192,10 +33273,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 "Modifica Ghiacciaio"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Vulcano"
@@ -33203,10 +33284,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 "Modifica vulcano"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -33214,5 +33295,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 "Modifica entrata di una grotta/caverna"
@@ -33220,5 +33301,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Isola"
@@ -33226,10 +33307,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 "Modifica isola"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr "Isoletta"
@@ -33237,15 +33318,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 "Modifica isoletta"
 
 #. group "Nature"
-#: build/trans_presets.java:4005
+#: build/trans_presets.java:4006
 msgid "Nature"
 msgstr "Natura"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4007
 msgid "Tree"
 msgstr "Albero"
@@ -33254,15 +33335,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 "Modifica albero singolo"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "Bosco"
@@ -33271,10 +33352,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 "Modifica bosco"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -33282,5 +33363,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -33288,5 +33369,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -33294,5 +33375,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Foresta"
@@ -33301,30 +33382,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 "Modifica area di foresta"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "Conifere"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "Mista"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -33332,15 +33413,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr "Prato alpino"
@@ -33348,20 +33429,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 "Modifica prato alpino"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "Brughiera"
@@ -33369,15 +33450,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 "Modifica brughiera"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "Aia"
@@ -33386,40 +33467,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 "Modifica aia"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr "Coltivazioni in serra"
@@ -33427,15 +33508,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 "Modifica coltivazioni in serra"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4098
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -33444,25 +33525,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr "Village Green"
@@ -33470,10 +33551,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 "Modifica Village Green"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4123
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -33481,20 +33562,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 "Modifica area comune (UK)"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4129
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -33502,5 +33583,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 "Modifica area di svago"
@@ -33508,15 +33589,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -33524,10 +33605,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 "Modifica Cimitero"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -33535,40 +33616,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 "Modifica area di cimitero (esteso)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr "Box per auto"
@@ -33576,10 +33657,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 "Modifica box per auto"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4190
+#: build/trans_presets.java:4191
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -33587,15 +33668,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 "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -33603,55 +33684,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr "Annotazione"
@@ -33659,5 +33740,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
@@ -33668,5 +33749,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 "Modifica dati indirizzo"
@@ -33674,5 +33755,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Numero civico"
@@ -33680,5 +33761,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Nome edificio"
@@ -33687,55 +33768,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 "Nome Strada"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Codice nazione"
 
 #. 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"
@@ -33743,5 +33824,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
@@ -33753,5 +33834,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 "Modifica interpolazione indirizzo"
@@ -33759,35 +33840,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "dispari"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "pari"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr "alfabetico"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4259
 msgid "Contact"
 msgstr "Contatto"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4260
 msgid "Edit Contact information"
 msgstr "Modifica informazioni di contatto"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4268
+#: build/trans_presets.java:4269
 msgid "Image"
 msgstr "Immagine"
@@ -33797,5 +33878,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 "Modifica un multi-poligono"
@@ -33807,5 +33888,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 "segmento esterno"
@@ -33813,5 +33894,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 "segmento interno"
@@ -33819,5 +33900,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr "Confine"
@@ -33828,5 +33909,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 "Modifica confine"
@@ -33834,46 +33915,51 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "Boundary type"
 msgstr "Tipo di confine"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "administrative"
 msgstr "amministrativo"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "national"
 msgstr "nazionale"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "civil"
 msgstr "civile"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "political"
 msgstr "circoscrizione elettorale"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4296
+#: build/trans_presets.java:4297
 msgid "Administrative level"
 msgstr "Livello amministrativo"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:4302
 msgid "Sub area"
 msgstr "Sotto-area"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4303
 msgid "Administration centre"
 msgstr "Centro amministrativo"
 
+#. 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 "Divieto di svolta"
@@ -33882,5 +33968,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 "Modifica un divieto di svolta"
@@ -33888,40 +33974,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 "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "non diritto"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -33930,15 +34016,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "dal percorso"
 
 #. 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 "nodo \"via\" o percorsi"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4317
+#: build/trans_presets.java:4319
 msgid "to way"
 msgstr "verso il percorso"
@@ -33946,5 +34032,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "Itinerario"
@@ -33958,5 +34044,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 "Modifica un itinerario"
@@ -33966,5 +34052,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 "Tipo di itinerario"
@@ -33972,5 +34058,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
@@ -33980,5 +34066,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 "strada"
@@ -33986,5 +34072,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 "traghetto"
@@ -33992,5 +34078,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 "sci"
@@ -34043,9 +34129,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 "pedone"
@@ -34053,5 +34139,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 "escursionismo"
@@ -34059,5 +34145,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
@@ -34067,5 +34153,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 "deviazione"
@@ -34079,6 +34165,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
@@ -34088,5 +34174,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 "Descrizione del simbolo"
@@ -34098,6 +34184,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 "Rete"
@@ -34105,5 +34191,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 "Stato dell''itinerario"
@@ -34111,5 +34197,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 "proposto"
@@ -34117,5 +34203,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 "alternativo"
@@ -34123,5 +34209,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 "temporaneo"
@@ -34129,5 +34215,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 "collegamento"
@@ -34135,5 +34221,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 "Colore (esadecimale)"
@@ -34145,15 +34231,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 "segmento di itinerario"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4343
+#: build/trans_presets.java:4345
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4344
+#: build/trans_presets.java:4346
 msgid "backward segment"
 msgstr "segmento opposto"
@@ -34161,5 +34247,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 "punto di fermata"
@@ -34167,5 +34253,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 "punto di fermata diretto"
@@ -34173,5 +34259,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 "punto di fermata opposto"
@@ -34179,5 +34265,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr "Percorso direzionale (Nord America)"
@@ -34191,25 +34277,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 "Modifica percorso direzionale (utilizzato in Nord America)"
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4375
 msgid "east segment"
 msgstr "segmento est"
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4374
+#: build/trans_presets.java:4376
 msgid "north segment"
 msgstr "segmento nord"
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4377
 msgid "west segment"
 msgstr "segmento ovest"
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:4378
 msgid "south segment"
 msgstr "segmento sud"
@@ -34217,5 +34303,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr "Rete di itinerari"
@@ -34223,5 +34309,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 "Modifica rete di itinerari"
@@ -34230,5 +34316,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr "membro"
@@ -34236,5 +34322,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr "Strada associata"
@@ -34242,10 +34328,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 "Modifica strada associata"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4402
+#: build/trans_presets.java:4404
 msgid "house"
 msgstr "edificio"
@@ -34440,6 +34526,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 "deprecato"
@@ -34471,5 +34557,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 "cavallo"
@@ -34624,10 +34710,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 "barriera"
@@ -34672,5 +34755,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr "superstrada"
@@ -34714,7 +34797,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 "tracciato stradale"
@@ -34788,5 +34871,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 "stazione di servizio"
@@ -34798,5 +34881,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr "guado"
@@ -34814,5 +34897,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 "banchina"
@@ -34823,5 +34906,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
@@ -34834,5 +34917,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 "punto di accesso di emergenza"
@@ -34844,5 +34927,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 "sponda"
@@ -34854,5 +34937,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "torrente"
@@ -34864,5 +34947,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "darsena"
@@ -35052,17 +35135,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 "costruzioni umane"
@@ -35074,5 +35157,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr "rapide"
@@ -35120,9 +35203,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 "punto ferroviario"
+
+#. <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"/>
@@ -35139,10 +35240,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 "altro ferrovia"
 
 #. color railover
-#: build/trans_style.java:966
+#: build/trans_style.java:981
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -35170,7 +35271,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 "vecchia ferrovia"
@@ -35205,6 +35306,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 "aeroporto"
@@ -35222,5 +35323,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 "aeroporto (scuro)"
@@ -35238,5 +35339,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 "aeroporto (chiaro)"
@@ -35296,8 +35397,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 "struttura_di_risalita"
@@ -35311,5 +35412,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_facile"
@@ -35321,5 +35422,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 "pista_intermedia"
@@ -35331,5 +35432,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_avanzata"
@@ -35341,5 +35442,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 "pista esperto"
@@ -35351,5 +35452,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 "pista libera"
@@ -35361,5 +35462,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 "pista_principiante"
@@ -35488,13 +35589,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 "elettricità"
@@ -35505,5 +35606,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 "pontile"
@@ -35515,5 +35616,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "conduttura"
@@ -35629,13 +35730,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 "struttura per lo svago"
@@ -35647,5 +35748,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "porto turistico"
@@ -35719,10 +35820,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 "struttura di servizio"
@@ -35806,11 +35907,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 "servizio al traffico"
@@ -36146,24 +36247,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 "struttura di servizio (chiaro)"
@@ -36189,6 +36290,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 "acqua (chiaro)"
@@ -36235,8 +36336,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 "salute"
@@ -36605,34 +36706,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 "negozio"
@@ -36688,8 +36789,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"
@@ -36765,9 +36866,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 "turismo"
@@ -36835,9 +36936,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 "attrazione storica"
@@ -36904,9 +37005,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 "verde"
@@ -36917,5 +37018,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "cava/miniera"
@@ -36927,5 +37028,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "discarica"
@@ -36943,5 +37044,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 "bacino"
@@ -36953,5 +37054,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "foresta"
@@ -36963,5 +37064,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr "box per auto"
@@ -36973,5 +37074,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "aia"
@@ -36990,5 +37091,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 "area commerciale (negozi)"
@@ -37000,5 +37101,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "industriale"
@@ -37010,5 +37111,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr "ridestinazione d''uso"
@@ -37020,5 +37121,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -37030,5 +37131,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr "area ferroviaria"
@@ -37073,7 +37174,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 "militare"
@@ -37085,5 +37186,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "cimitero"
@@ -37094,5 +37195,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "picco montuoso"
@@ -37105,5 +37206,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 "ghiacciaio"
@@ -37115,5 +37216,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 "vulcano"
@@ -37155,8 +37256,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 "elemento naturale"
@@ -37168,5 +37269,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "boscaglia"
@@ -37178,5 +37279,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "brughiera"
@@ -37188,5 +37289,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr "area boschiva non gestita"
@@ -37198,5 +37299,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -37208,5 +37309,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "spiaggia"
@@ -37266,8 +37367,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 "itinerario"
@@ -37346,12 +37447,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 "confine"
@@ -37467,11 +37568,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 "luogo"
@@ -37483,5 +37584,5 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
 msgstr "dati tiger"
@@ -37517,6 +37618,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"
@@ -37757,9 +37858,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"
@@ -37767,44 +37867,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 "Bing Sat"
 
 #. <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 Satellite"
-
-#. <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 "MapQuest Open Aerial"
@@ -37812,11 +37899,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 "OpenStreetMap (Mapnik)"
@@ -37824,73 +37910,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 "MapQuest OSM"
 
 #. <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 "Copertura ODBL"
 
 #. <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"
-msgstr "Ö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>
@@ -37898,29 +38011,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 "Stile tedesco"
-
-#. <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 "Geofabrik.de delle strade del Nord Reno-Westfalia"
 
+#. <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>
@@ -37928,13 +38056,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"
-msgstr "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>
@@ -37942,13 +38070,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"
-msgstr "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>
@@ -37956,13 +38084,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 "Mappa OpenPT"
 
 #. <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>
@@ -37972,273 +38100,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)"
-msgstr "Baviera (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"
-msgstr "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 "Geoimage.at (alta risoluzione)"
-
-#. <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 "MSR Maps Topo"
 
 #. <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 "MSR Maps Urban"
 
 #. <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 "Mappe NPE"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr "7a Serie (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 "Mappe NPE (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 "7a Serie (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 Giappone (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 Giappone (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 Giappone (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 Giappone (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 "Sicilia - 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 "PCN 2006 - Italia"
 
 #. <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)"
-msgstr "SPOTMaps (Francia)"
+#. <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 "PNOA Spagna"
 
 #. <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 "Estonia Basemap (Maaamet)"
 
 #. <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 "Estonia Ortho (Maaamet)"
 
 #. <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 "Estonia Multi (Maaamet)"
 
 #. <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 (Danimarca)"
 
 #. <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>
@@ -38246,35 +39197,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 (Danimarca)"
 
 #. <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)"
-msgstr "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 "ScanEx IRS"
@@ -38286,9 +39253,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 "South Africa Topo (OOC)"
@@ -40897,4 +41865,21 @@
 msgstr "GPX"
 
+#: ../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
@@ -41511,18 +42496,18 @@
 msgstr "m"
 
-#: ../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 "Importa..."
 
-#: ../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 "Importa immagini vettoriali."
 
-#: ../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 "Immagini SVG (*.svg)"
 
-#: ../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 "Importazione in corso..."
@@ -42227,16 +43212,15 @@
 msgstr "Misure"
 
-#: ../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 "Unisci sovrapposizioni"
 
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:55
 msgid "Merge overlap of ways."
 msgstr "Unisci le sovrapposizioni dei percorsi."
 
-#. Commit
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:264
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:243
 msgid "Merge Overlap (combine)"
 msgstr "Unisci sovrapposizioni (combina)"
@@ -42294,12 +43278,213 @@
 msgstr "Informazioni sull''estensione"
 
+#: ../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 "Estensione per la gestione nativa delle password"
 
+#: ../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 "Non è stato trovato alcun gestore delle password nativo!"
 
+#: ../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
+#, fuzzy
+msgid ""
+"Depending on your Operating Stystem / Distribution, you may have to create a "
+"default keyring / wallet first."
+msgstr ""
+"In base al proprio sistema operativo / distribuzione potrebbe essere "
+"necessario creare prima un portachiavi predefinito."
+
+#: ../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
+#, fuzzy
+msgid "No thanks, use JOSM's plain text preferences storage"
+msgstr "No grazie, memorizza il testo in chiaro nelle preferenze di JOSM"
+
+#: ../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
+#, fuzzy
+msgid ""
+"Found sensitive data that is still saved in JOSM's preference file (plain "
+"text)."
+msgstr ""
+"Sono stati trovati dei dati sensibili che sono rimasti nelle preferenze di "
+"JOSM (testo in chiaro)."
+
+#: ../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 "No, mantieni"
+
+#: ../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 "Chiudi la finestra ed annulla tutte le modifiche"
+
+#: ../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 "Procedi e vai alla pagina successiva"
+
+#: ../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 "Fine"
+
+#: ../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 "Conferma le impostazioni e chiudi questa finestra"
+
+#: ../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 "Nome utente JOSM/OSM API"
+
+#: ../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 "Password JOSM/OSM API"
+
+#: ../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 "Nome utente JOSM/Proxy"
+
+#: ../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 "Password JOSM/Proxy"
+
+#: ../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 "Chiave JOSM/OAuth/OSM API"
+
+#: ../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 "Codice segreto JOSM/OAuth/OSM API"
+
+#: ../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 "Estensione per la gestione nativa delle password"
+
+#: ../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
+msgid "The username and password is protected by {0}."
+msgstr "Il nome utente e la password sono protetti da {0}."
+
+#: ../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 "nome utente"
+
+#: ../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 "password"
+
+#: ../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 "nome utente del proxy"
+
+#: ../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 "password del proxy"
+
+#: ../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 "chiave oauth"
+
+#: ../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 "codice segreto oauth"
+
+#: ../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
+#, fuzzy
+msgid ""
+"<br><strong>Warning:</strong> There may be sensitive data left in your "
+"preference file. ("
+msgstr ""
+"<br><strong>Attenzione:</strong> Ci potrebbero essere dei dati sensibili nel "
+"proprio file delle preferenze. ({0})"
+
+#: ../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
+msgid "Save user and password ({0})"
+msgstr "Memorizza utente e password ({0})"
+
+#: ../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 "Testo in chiaro, predefinito JOSM"
+
+#: ../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
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:33
+#, java-format
+msgid "Use {0}"
+msgstr "Utilizza {0}"
+
+#: ../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 "Cifra i dati con le credenziali di accesso di Windows"
+
+#: ../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 ""
+"E'' stato individuato sul proprio sistema il gestore nativo delle password "
+"{0}."
+
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208
 msgid ""
@@ -42328,81 +43513,4 @@
 "preferenze"
 
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324
-msgid "No, just keep it"
-msgstr "No, mantieni"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464
-msgid "Close the dialog and discard all changes"
-msgstr "Chiudi la finestra ed annulla tutte le modifiche"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499
-msgid "Proceed and go to the next page"
-msgstr "Procedi e vai alla pagina successiva"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517
-msgid "Finish"
-msgstr "Fine"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519
-msgid "Confirm the setup and close this dialog"
-msgstr "Conferma le impostazioni e chiudi questa finestra"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139
-msgid "JOSM/OSM API/Username"
-msgstr "Nome utente JOSM/OSM API"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140
-msgid "JOSM/OSM API/Password"
-msgstr "Password JOSM/OSM API"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144
-msgid "JOSM/Proxy/Username"
-msgstr "Nome utente JOSM/Proxy"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145
-msgid "JOSM/Proxy/Password"
-msgstr "Password JOSM/Proxy"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191
-msgid "JOSM/OAuth/OSM API/Key"
-msgstr "Chiave JOSM/OAuth/OSM API"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192
-msgid "JOSM/OAuth/OSM API/Secret"
-msgstr "Codice segreto JOSM/OAuth/OSM API"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211
-msgid "Native Password Manager Plugin"
-msgstr "Estensione per la gestione nativa delle password"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212
-#, java-format
-msgid "The username and password is protected by {0}."
-msgstr "Il nome utente e la password sono protetti da {0}."
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216
-msgid "username"
-msgstr "nome utente"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219
-msgid "password"
-msgstr "password"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222
-msgid "proxy username"
-msgstr "nome utente del proxy"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225
-msgid "proxy password"
-msgstr "password del proxy"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228
-msgid "oauth key"
-msgstr "chiave oauth"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231
-msgid "oauth secret"
-msgstr "codice segreto oauth"
-
 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234
 #, java-format
@@ -42413,31 +43521,4 @@
 "<br><strong>Attenzione:</strong> Ci potrebbero essere dei dati sensibili nel "
 "proprio file delle preferenze. ({0})"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:242
-#, java-format
-msgid "Save user and password ({0})"
-msgstr "Memorizza utente e password ({0})"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:16
-msgid "Plain text, JOSM default"
-msgstr "Testo in chiaro, predefinito JOSM"
-
-#: ../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
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:33
-#, java-format
-msgid "Use {0}"
-msgstr "Utilizza {0}"
-
-#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:38
-msgid "Encrypt data with Windows logon credentials"
-msgstr "Cifra i dati con le credenziali di accesso di Windows"
-
-#: ../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 ""
-"E'' stato individuato sul proprio sistema il gestore nativo delle password "
-"{0}."
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
@@ -43864,4 +44945,16 @@
 msgstr "Ripristina il gruppo di modifiche #{0}"
 
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
+msgid "Found XML element <nd> not as direct child of element <way>."
+msgstr ""
+"E’ stato trovato un elemento XML <nd> non come figlio diretto dell’elemento "
+"<way>."
+
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
+msgid "Found XML element <member> not as direct child of element <relation>."
+msgstr ""
+"E’ stato trovato l’elemento XML <member> non come figlio diretto "
+"dell’elemento <relation>."
+
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:29
 msgid "Image files"
@@ -44038,4 +45131,24 @@
 msgstr "Elimina i nodi non necessari di un’area"
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "Si, elimina i nodi"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Elimina i nodi esterni all’area scaricata"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "No, annulla"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "Eliminarli comunque?"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "Eliminare i nodi esterni all’area?"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -44097,9 +45210,4 @@
 msgid "Error while exporting {0}: {1}"
 msgstr "Errore durante l''esportazione di {0}: {1}"
-
-#: ../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 "Percorso: "
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -44823,9 +45931,9 @@
 msgstr "Seleziona la relazione affetta dal problema."
 
-#: ../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 "Aggiungi svolta"
 
-#: ../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 "Elimina corsia."
@@ -44931,9 +46039,9 @@
 "stato eliminato o reso invisibile nel livello ''{1}''"
 
-#: ../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 "Elimina i ruoli selezionati o rimuovi i membri selezionati"
 
-#: ../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 ""
@@ -44941,9 +46049,9 @@
 "appunti"
 
-#: ../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 "Sposta i membri della relazione selezionati in basso di una posizione"
 
-#: ../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 "Sposta i membri della relazione selezionati in alto di una posizione"
@@ -45760,4 +46868,20 @@
 msgstr "Si prega di selezionare uno o più percorsi tra loro intersecanti."
 
+#: ../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 "Configura indirizzo URL personalizzato"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:33
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:46
@@ -45781,28 +46905,12 @@
 msgstr "Estrai nodo dalla linea"
 
-#: ../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 "Apri un indirizzo URL."
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
-#, fuzzy
+msgstr "Apri indirizzo URL personalizzato"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:38
 msgid "Opens specified URL browser"
-msgstr "Apri nel browser"
-
-#: ../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 "Configura siti..."
+msgstr "Apre uno specifico indirizzo URL"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
@@ -45864,7 +46972,37 @@
 msgstr "Relazioni staccate"
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:51
 msgid "More tools"
 msgstr "Ulteriori strumenti"
+
+#: ../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
@@ -45990,5 +47128,5 @@
 msgstr "Seleziona i percorsi che si intersecano"
 
-#: ../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 ""
@@ -46004,5 +47142,5 @@
 msgstr "Seleziona tutti i percorsi che si intersecano"
 
-#: ../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 ""
@@ -46019,13 +47157,27 @@
 
 #: ../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 "Selezionare due nodi connessi da un percorso!"
 
-#: ../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 "Sono stati aggiunti troppi percorsi: {0}!"
+
+#: ../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 ""
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:27
@@ -46380,4 +47532,265 @@
 msgstr "Guida una macchina da corsa su questo livello"
 
-#~ msgid "oneway combined with *:backward/forward"
-#~ msgstr "senso unico combinato con *:backward/forward"
+#~ msgid "NPE Maps"
+#~ msgstr "Mappe NPE"
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "Open Aerial Map"
+
+#~ msgid "Overlapping areas"
+#~ msgstr "Aree sovrapposte"
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "Mappe NPE (Tim)"
+
+#~ msgid ""
+#~ "The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+#~ "This may lead to wrong coordinates."
+#~ msgstr ""
+#~ "La proiezione ''{0}'' della URL e quella in uso ''{1}'' non coincidono.\n"
+#~ "Potrebbero essere presenti errori nelle coordinate."
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Yahoo Sat"
+#~ msgstr "Yahoo Satellite"
+
+#~ msgid "Invalid URL?"
+#~ msgstr "Indirizzo URL non valido?"
+
+#~ msgid "Yes, fetch images"
+#~ msgstr "Si, preleva le immagini"
+
+#~ msgid "(deactivated)"
+#~ msgstr "(disattivato)"
+
+#~ msgid ""
+#~ "Warning: Fetching WMS tiles is likely to fail. Please check you "
+#~ "preference settings."
+#~ msgstr ""
+#~ "Attenzione: il prelevamento dei tasselli WMS probabilmente fallisce. "
+#~ "Verificare le proprie impostazioni."
+
+#~ msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+#~ msgstr ""
+#~ "Attenzione: il livello WMS è stato disattivato a causa dell''indirizzo "
+#~ "url non corretto ''{0}''"
+
+#~ msgid "Warning: The complete URL is ''{0}''."
+#~ msgstr "Attenzione: l''indirizzo URL completo è ''{0}''."
+
+#~ msgid "Near"
+#~ msgstr "Vicino a"
+
+#~ msgid "MLIT Japan (ORTHO)"
+#~ msgstr "MLIT Giappone (ORTHO)"
+
+#~ msgid "MLIT Japan (ORTHO01)"
+#~ msgstr "MLIT Giappone (ORTHO01)"
+
+#~ msgid "MLIT Japan (ORTHO02)"
+#~ msgstr "MLIT Giappone (ORTHO02)"
+
+#~ msgid "MLIT Japan (ORTHO03)"
+#~ msgstr "MLIT Giappone (ORTHO03)"
+
+#~ msgctxt "placeselection"
+#~ msgid "Zoom"
+#~ msgstr "Ingrandimento"
+
+#~ msgid "Save Access Token to preferences"
+#~ msgstr "Salva il token di accesso nelle preferenze"
+
+#~ msgid "Object history"
+#~ msgstr "Storico dell''oggetto"
+
+#~ msgid "Info about Element"
+#~ msgstr "Informazioni riguardanti l''elemento"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr ""
+#~ "Visualizza le informazioni dell''oggetto OSM su nodi, percorsi o "
+#~ "relazioni."
+
+#~ 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] ""
+#~ "Impossibile aprire {0} file perché non è disponibile alcun importatore di "
+#~ "file."
+#~ msgstr[1] ""
+#~ "Impossibile aprire {0} file perché non è disponibile alcun importatore di "
+#~ "file."
+
+#~ msgid "Inspect"
+#~ msgstr "Analizza"
+
+#~ msgid "Get detailed information on the internal state of the objects."
+#~ msgstr "Ottieni informazioni dettagliate sullo stato interno degli oggetti."
+
+#~ msgid "SPOTMaps (France)"
+#~ msgstr "SPOTMaps (Francia)"
+
+#~ msgid "xx l/min"
+#~ msgstr "xx l/min"
+
+#~ msgid "Pressure"
+#~ msgstr "Pressione"
+
+#~ msgid "Diameter"
+#~ msgstr "Diametro"
+
+#~ msgid "Geoimage.at"
+#~ msgstr "Geoimage.at"
+
+#~ msgid "Deutsche Karte"
+#~ msgstr "Deutsche Karte"
+
+#~ msgid "Sorbische Karte"
+#~ msgstr "Sorbische Karte"
+
+#~ 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 ""
+#~ "<html>L''indirizzo URL<br>''{0}''<br>per questo livello WMS non finisce "
+#~ "con una ''&'' e neanche con un ''?''.<br>Questo può causare delle "
+#~ "richieste WMS non valide.<br>Si dovrebbero controllare le proprie "
+#~ "impostazioni.<br>Si desidera ottenere ugualmente i tasselli WMS?</html>"
+
+#~ msgid "Pangasinan (Phillipines HiRes)"
+#~ msgstr "Pangasinan (Phillipines HiRes)"
+
+#~ msgid "  members:\n"
+#~ msgstr "  membri:\n"
+
+#~ msgid "  nodes:\n"
+#~ msgstr "  nodi:\n"
+
+#~ msgid "Relation id={0}"
+#~ msgstr "ID relazione={0}"
+
+#~ msgid "Node id={0}"
+#~ msgstr "ID nodo={0}"
+
+#~ msgid " not in data set"
+#~ msgstr " non nell''insieme dei dati"
+
+#~ msgid " incomplete\n"
+#~ msgstr " incompleto\n"
+
+#~ msgid "Way id={0}"
+#~ msgstr "ID percorso={0}"
+
+#~ msgid " (reversed)"
+#~ msgstr " (invertito)"
+
+#~ msgid "; has direction keys"
+#~ msgstr "; possiede chiavi di direzione"
+
+#~ msgid "; deleted"
+#~ msgstr "; eliminato"
+
+#~ msgid "; filtered/disabled"
+#~ msgstr "; filtrato/disabilitato"
+
+#~ msgid "; filtered/hidden"
+#~ msgstr "; filtrato/nascosto"
+
+#~ msgid "; modified"
+#~ msgstr "; modificato"
+
+#~ msgid "  tags:\n"
+#~ msgstr "  etichette:\n"
+
+#~ msgid "; deleted-on-server"
+#~ msgstr "; eliminato-sul-server"
+
+#~ msgid "id: {0}"
+#~ msgstr "id: {0}"
+
+#~ msgid " name: {0}"
+#~ msgstr " nome: {0}"
+
+#~ msgid "  relation referrer:\n"
+#~ msgstr "  relazione collegata:\n"
+
+#~ msgid "  way referrer:\n"
+#~ msgstr "  percorso collegato:\n"
+
+#~ msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
+#~ msgstr " lat={0} lon={1} (proiezione: x={2}, y={3}); "
+
+#~ msgid " {0} name: {1}"
+#~ msgid_plural " {0} names: {1}"
+#~ msgstr[0] " {0} nome: {1}"
+#~ msgstr[1] " {0} nomi: {1}"
+
+#~ msgid ""
+#~ "Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: "
+#~ "{4}"
+#~ msgstr ""
+#~ "Insieme dei dati: {0}; Utente: [{1}]; ID dell''insieme di modifiche: {2}; "
+#~ "Data e ora: {3}; Versione: {4}"
+
+#~ msgid " {0} member; "
+#~ msgid_plural " {0} members; "
+#~ msgstr[0] " {0} membro; "
+#~ msgstr[1] " {0} membri; "
+
+#~ msgid " {0} node; "
+#~ msgid_plural " {0} nodes; "
+#~ msgstr[0] " {0} nodo; "
+#~ msgstr[1] " {0} nodi; "
+
+#~ msgid "German Style"
+#~ msgstr "Stile tedesco"
+
+#~ msgid "Bayern (2m)"
+#~ msgstr "Baviera (2m)"
+
+#~ msgid ""
+#~ "Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing "
+#~ "''&'' or a trailing ''?''."
+#~ msgstr ""
+#~ "Attenzione: l''indirizzo URL di base ''{0}'' per un servizio WMS non può "
+#~ "finire con il carattere ''&'' o il carattere ''?''."
+
+#~ msgid "Geoimage.at (HighRes)"
+#~ msgstr "Geoimage.at (alta risoluzione)"
+
+#~ msgid ""
+#~ "Warning: Could not detect type of imagery source ''{0}''. Using default "
+#~ "(xml)."
+#~ msgstr ""
+#~ "Attenzione: impossibile individuare il tipo della sorgente di immagini "
+#~ "aeree ''{0}''. Utilizzo il predefinito (xml)."
+
+#~ msgid "Wood Fence"
+#~ msgstr "Recinto di legno"
+
+#~ msgid "In conflict with:\n"
+#~ msgstr "In conflitto con:\n"
+
+#~ msgid "Wire Fence"
+#~ msgstr "Recinto di rete"
+
+#~ msgid "ÖPNV"
+#~ msgstr "ÖPNV"
+
+#~ 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 ""
+#~ "E'' possibile aprire un indirizzo URL personalizzato per <b>un</b> "
+#~ "oggetto selezionato<br/> <b>&#123;key&#125;</b> è sostituito con il "
+#~ "valore dell''etichetta<br/> <b>&#123;#id&#125;</b> è sostituito con l''ID "
+#~ "dell''elemento<br/> <b>&#123;#type&#125;</b> è sostituito con \"node\","
+#~ "\"way\" oppure \"relation\" <br/> <b>&#123;#lat&#125; , &#123;#lon&#125;</"
+#~ "b> è sostituito con la latitudine/longitudine dell''elemento"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 26723)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 26724)
@@ -4,29 +4,11 @@
 # 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-08-17 03:22+0000\n"
-"Last-Translator: higa4 <higa432@gmail.com>\n"
+"POT-Creation-Date: 2011-09-27 19:09+0200\n"
+"PO-Revision-Date: 2011-09-17 12:59+0000\n"
+"Last-Translator: nori_u <Unknown>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
 "Language: ja\n"
@@ -35,6 +17,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-09-02 19:15+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:54+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-Language: Japanese\n"
@@ -47,6 +29,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
@@ -71,8 +53,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
@@ -84,7 +66,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
@@ -98,8 +80,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
@@ -111,5 +94,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
@@ -119,6 +101,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
@@ -132,10 +114,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"
@@ -173,14 +156,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
@@ -191,7 +174,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
@@ -207,6 +190,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
@@ -216,5 +199,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
@@ -398,8 +381,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
@@ -413,6 +396,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
@@ -424,6 +407,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
@@ -438,6 +421,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
@@ -459,7 +442,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
@@ -476,5 +461,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 "キャンセル"
@@ -485,4 +470,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 ""
@@ -545,4 +531,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
@@ -591,5 +578,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
@@ -607,4 +594,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
@@ -625,5 +613,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
@@ -641,4 +629,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
@@ -670,8 +659,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
@@ -700,5 +689,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 "データ"
@@ -767,5 +756,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 "開いた変更セットを閉じる"
@@ -785,6 +774,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
@@ -863,9 +852,10 @@
 msgstr "コピーするものを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:19
 msgid "Copy Coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:18
 msgid "Copy coordinates of selected nodes to clipboard."
 msgstr ""
@@ -922,13 +912,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
@@ -940,5 +930,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
@@ -958,14 +948,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:225
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:102
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:227
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:96
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:97
 msgid "Overwrite"
 msgstr "上書きする"
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:99
 msgid "File exists. Overwrite?"
 msgstr "ファイルが存在します。上書きしますか？"
@@ -1155,5 +1145,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}"
@@ -1227,12 +1217,26 @@
 msgstr "GPX ファイルをエクスポート"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "オブジェクト履歴"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:23
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:65
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
+msgid "History"
+msgstr "履歴"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "OSM ウェイ、ノードまたはリレーションについて履歴情報を表示"
+
+#: ../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
@@ -1277,5 +1281,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"
@@ -1306,12 +1310,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 "要素についての情報"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示"
+#: ../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
@@ -1331,6 +1347,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."
@@ -1340,21 +1359,24 @@
 "選択したウェイにはダウンロードされたデータ領域の外にノードがあります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 msgid "This can lead to nodes being deleted accidentally."
 msgstr "これにより思わぬノードが削除されることがあります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:341
 msgid "Are you really sure to continue?"
 msgstr "本当に継続しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:695
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:839
 msgid "Please abort if you are not sure"
 msgstr "確信していないならば、中止して下さい。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:362
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:384
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
+msgid "The selected area is incomplete. Continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:355
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:377
 msgid "No intersection found. Nothing was changed."
 msgstr "交差点がみつかりません。何も変更されませんでした。"
@@ -1362,33 +1384,33 @@
 #. revert changes
 #. FIXME: this is dirty hack
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:383
 msgid "Reverting changes"
 msgstr "変更を戻します"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr "重複したノードを削除しました"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:451
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:444
 msgid "Added node on all intersections"
 msgstr "すべての交差点にノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr "新しいポリゴンをまとめる"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr "リレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:516
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:509
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "内側のマルチポリゴンの一部ではないウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr "結合されたオーバーラップエリア"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:522
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:515
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1398,13 +1420,13 @@
 "確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "タグの競合を修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr "ウェイを断片に分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1234
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
@@ -1412,5 +1434,5 @@
 "ません。"
 
-#: ../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."
@@ -1419,6 +1441,6 @@
 "ません。"
 
+#: ../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 "
@@ -1428,5 +1450,5 @@
 "は扱えません。"
 
-#: ../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."
@@ -1435,14 +1457,14 @@
 "ません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363
 msgid "Removed Element from Relations"
 msgstr "リレーションから要素を削除"
 
 #. I18N: current action printed in status display
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1439
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1432
 msgid "Remove tags from inner ways"
 msgstr "内部のウェイからタグを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr "エリア結合機能"
@@ -1654,4 +1676,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
@@ -1671,8 +1694,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 "上"
@@ -1692,4 +1716,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
@@ -1709,8 +1734,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 "下"
@@ -1790,11 +1816,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] ""
-"ファイル{0}は、対応するファイル取り込みフィルターがないため開けません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209
+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>"
@@ -1803,9 +1840,9 @@
 "い。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1813,5 +1850,5 @@
 msgstr[0] "{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}'' ..."
@@ -1941,7 +1978,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
@@ -2115,5 +2152,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 "保存"
@@ -2129,30 +2166,30 @@
 msgstr "ファイル {0}は存在します。上書きしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "No Exporter found! Nothing saved."
 msgstr "エクスポーターが見つかりません! 何も保存されませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "空の文書"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "それでも保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "The document contains no data."
 msgstr "文書にデータが含まれない"
 
 #. I18N: Display title of the window showing conflicts
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
 msgid "Conflicts"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "競合を否定して保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -2162,13 +2199,13 @@
 "れます。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "ファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "GPXファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "レイヤーを保存"
@@ -2221,5 +2258,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
@@ -2229,55 +2266,22 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1384
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1394
 msgid "Close"
 msgstr "閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "ウェイの単純化"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Delete unnecessary nodes from a way."
 msgstr "ウェイから不要なノードを削除してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:66
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
-msgid "Yes, delete nodes"
-msgstr "はい、ノードを削除"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
-msgid "Delete nodes outside of downloaded data regions"
-msgstr "ダウンロード済みデータ領域の外側のノードを削除"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:263
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
-msgid "No, abort"
-msgstr "いいえ、異常終了します"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:120
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
-msgid "Cancel operation"
-msgstr "操作をキャンセル"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
-msgid "Do you want to delete them anyway?"
-msgstr "強制削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89
-#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
-msgid "Delete nodes outside of data regions?"
-msgstr "データ領域外のノードを削除しますか？"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:49
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:90
 msgid "Please select at least one way to simplify."
 msgstr "簡略化には、少なくとも1つのウェイを選択してください。"
 
-#: ../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
@@ -2288,10 +2292,16 @@
 msgstr "はい"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:95
 msgid "Simplify all selected ways"
 msgstr "全ての選択されたウェイを簡素化"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
+msgid "Cancel operation"
+msgstr "操作をキャンセル"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2300,10 +2310,10 @@
 msgstr "選択は {0} ウェイを含みます。本当にこれらを全て簡素化しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:77
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 msgid "Simplify ways?"
 msgstr "ウェイを簡素化しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:196
 #, java-format
@@ -2312,5 +2322,5 @@
 msgstr[0] "{0} ウェイを簡素化"
 
-#: ../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)"
@@ -2370,5 +2380,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 "
@@ -2379,5 +2389,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 "
@@ -2415,37 +2425,37 @@
 msgstr "複数のウェイに使われているノードを複製します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:86
 msgid "This node is not glued to anything else."
 msgstr "このノードは、他のどれとも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of these nodes are glued to anything else."
 msgstr "どのノードも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
 msgid "None of this way''s nodes are glued to anything else."
 msgstr "どのウェイも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "The current selection cannot be used for unglueing."
 msgstr "現在の選択は引き離せません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "ほかを選択："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* 1つのタグのついたノード、または"
 
-#: ../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 "* 1つ以上のウェイに使われている1つのノード, または"
 
-#: ../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 "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
 
-#: ../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"
@@ -2453,5 +2463,5 @@
 "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
 
-#: ../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."
@@ -2459,5 +2469,5 @@
 "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
 
-#: ../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"
@@ -2472,18 +2482,35 @@
 "コピーが作られ、全てのノードが選択状態になります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr "ノードを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:377
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "{0}ノードと見なす"
 
-#: ../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"
 msgid_plural "Dupe {0} nodes into {1} nodes"
 msgstr[0] "{0}このノードが{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
@@ -2579,14 +2606,14 @@
 msgstr "選択は空です"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
 msgid "Upload data"
 msgstr "データをアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "有効なデータレイヤーでの全ての変更をアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2597,5 +2624,5 @@
 "ます。<br>まずそれを先に解消してください</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
@@ -2603,5 +2630,5 @@
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:196
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
@@ -3075,8 +3102,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
@@ -3457,5 +3484,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 "検索"
@@ -3702,5 +3729,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 "その他"
@@ -3851,6 +3878,6 @@
 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 ""
@@ -3858,20 +3885,20 @@
 "ました"
 
-#: ../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} を削除"
 
-#: ../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} を削除"
 
-#: ../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} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
 #, java-format
 msgid "Delete {0} object"
@@ -3879,5 +3906,5 @@
 msgstr[0] "{0} 個のオブジェクトを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} node"
@@ -3885,5 +3912,5 @@
 msgstr[0] "{0} 個のノードを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -3891,5 +3918,5 @@
 msgstr[0] "{0} 個のウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -3897,13 +3924,15 @@
 msgstr[0] "{0} 個のリレーションを削除"
 
-#: ../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}''を削除"
 
-#. 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."
@@ -3915,14 +3944,5 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../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 "
@@ -4134,4 +4154,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}''"
@@ -4139,19 +4160,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 "不正な経度の値 ''{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 "警告: プリセットの設定を ''{0}''とするのに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:459
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "不正な設定がファイルの{0}行目にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4162,5 +4184,5 @@
 "ありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4171,5 +4193,5 @@
 "ではありません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4179,5 +4201,5 @@
 "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4188,5 +4210,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4196,5 +4218,5 @@
 "成します。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4204,5 +4226,5 @@
 "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4213,5 +4235,5 @@
 "トできません</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4222,5 +4244,5 @@
 "<br>に取って、新しい初期設定ファイルを作ります。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4229,5 +4251,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}"
@@ -4301,20 +4323,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"
@@ -4332,5 +4354,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}."
@@ -4338,5 +4360,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}."
@@ -4356,5 +4378,5 @@
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346
 #, java-format
 msgid ""
@@ -4362,5 +4384,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817
 #, java-format
 msgid ""
@@ -4431,5 +4453,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 "
@@ -4439,5 +4461,5 @@
 "う一方は新規ではないためです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952
 #, java-format
 msgid ""
@@ -4449,5 +4471,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"
@@ -4468,6 +4490,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"
@@ -4822,5 +4844,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 ""
@@ -4850,4 +4872,9 @@
 msgid "Running test {0}"
 msgstr "テスト {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
@@ -4902,71 +4929,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 "Naturalカテゴリの重複ノード"
 
-#: ../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 "Buildingカテゴリの重複ノード"
 
-#: ../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 "Landuseカテゴリの重複ノード"
 
-#: ../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 "同位置のノード"
@@ -5029,54 +5083,54 @@
 
 #. item "Relations/Multipolygon"
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4272
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52
+#: build/trans_presets.java:4273
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:53
 msgid "This test checks if multipolygons are valid"
 msgstr "このテストはマルチポリゴンが適切かどうかチェックします"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:122
 msgid "Area style way is not closed"
 msgstr "エリアスタイルウェイが閉じられていません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:146
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:147
 msgid "No outer way for multipolygon"
 msgstr "マルチポリゴンに外側のウェイがありません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:182
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:183
 msgid "No style for multipolygon"
 msgstr "マルチポリゴンにスタイルがありません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:184
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:185
 msgid "No style in multipolygon relation"
 msgstr "マルチポリゴンのリレーションにスタイルがありません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:203
 msgid "Style for inner way equals multipolygon"
 msgstr "インナーウェイのスタイルはマルチポリゴンと同じです"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:220
 msgid "Style for outer way mismatches"
 msgstr "アウターウェイのスタイルがアンマッチです"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:228
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:238
 msgid "Multipolygon is not closed"
 msgstr "マルチポリゴンが閉じられていません"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:251
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:261
 msgid "Multipolygon inner way is outside"
 msgstr "マルチポリゴンのインナーウェイが外側です"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:254
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:264
 msgid "Intersection between multipolygon ways"
 msgstr "マルチポリゴンウェイ間の交差"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:265
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:275
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:269
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:279
 msgid "Non-Way in multipolygon"
 msgstr ""
@@ -5110,4 +5164,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."
@@ -5122,29 +5181,25 @@
 "チェックします。"
 
-#: ../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 "重なったウェイ"
@@ -5347,7 +5402,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
@@ -5368,7 +5423,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
@@ -5394,5 +5449,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."
@@ -5554,48 +5609,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 "自然のタイプ {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 "土地利用のタイプ {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 "アメニティのタイプ {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:84
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:82
 #, java-format
 msgid "sport type {0}"
 msgstr "スポーツのタイプ {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:88
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:86
 #, java-format
 msgid "tourism type {0}"
 msgstr "旅行関係のタイプ {0}"
 
-#: ../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}"
 
-#: ../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}"
 
-#: ../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}"
@@ -5643,7 +5698,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"
@@ -5655,10 +5710,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 "閉じていないウェイ"
@@ -5791,7 +5846,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}]"
@@ -5829,14 +5884,15 @@
 msgstr "次回から表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:287
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:303
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
 msgid "incomplete"
 msgstr "不完全"
 
 #. I18n: name of house as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:150
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:234
 #, java-format
 msgid "House {0}"
@@ -5845,6 +5901,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}"
@@ -5852,12 +5908,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 "道路"
@@ -5865,17 +5921,17 @@
 #. item "Relations/Route" combo "Route type" display value
 #. item "Relations/Directional Route (North America)" combo "Route type" display value
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561
-#: build/trans_presets.java:4330 build/trans_presets.java:4360
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:601
+#: build/trans_presets.java:4332 build/trans_presets.java:4362
 msgid "railway"
 msgstr "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:602
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:227
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:603
 msgid "landuse"
 msgstr "土地利用"
@@ -5884,8 +5940,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
@@ -5895,6 +5951,6 @@
 msgstr[0] "{0} 個のノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:308
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:658
 #, java-format
 msgid "{0} member"
@@ -5902,9 +5958,9 @@
 msgstr[0] "{0}  個のメンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr "公共輸送機関"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:494
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -6010,5 +6066,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 "画像"
@@ -6248,5 +6304,5 @@
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../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"
@@ -6254,10 +6310,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
 #: build/specialmessages.java:89
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:189
 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
@@ -6266,5 +6322,5 @@
 msgstr "ツール"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -6272,5 +6328,5 @@
 msgstr "プリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:228
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -6281,5 +6337,5 @@
 msgstr "メニュー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "音声"
@@ -6316,5 +6372,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"
@@ -6322,5 +6378,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"
@@ -6478,5 +6534,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
@@ -6662,5 +6718,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
@@ -6670,5 +6726,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"
@@ -6678,5 +6734,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 "メンバー"
@@ -6906,5 +6962,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
@@ -7036,4 +7092,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 "削除しました"
@@ -7103,6 +7160,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
@@ -7124,6 +7181,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
@@ -7233,5 +7290,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"
@@ -7313,5 +7370,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
@@ -7322,5 +7379,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
@@ -7461,9 +7518,9 @@
 msgstr "複数の値を持つタグのみを表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:164
 msgid "For selected objects only"
 msgstr "選択したオブジェクトのみ表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:165
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7474,18 +7531,18 @@
 "を解除するとデータレイヤ内のオブジェクト全ての変更セットを表示。</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 "変更セット"
 
-#: ../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
@@ -7493,23 +7550,23 @@
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:340
 msgid "Download information about the selected changesets from the OSM server"
 msgstr "OSMサーバから選択された変更セットについての情報をダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:375
 msgid "Closes the selected open changesets"
 msgstr "選択されたオープン済み変更セットを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:406
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
 msgid "Show info"
 msgstr "情報を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:407
 msgid "Open a web page for each selected changeset"
 msgstr "選択された変更セットそれぞれにウェブページを開く"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:446
 #: build/specialmessages.java:49
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
@@ -7517,5 +7574,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 "変更セットマネージャを開く"
@@ -7534,12 +7591,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
@@ -7587,5 +7644,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
@@ -7761,19 +7818,13 @@
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<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 "履歴"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64
 msgid "Display the history of all selected items."
 msgstr "選択したアイテムすべての履歴"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:242
 msgid "Object with history"
 msgstr "履歴があるオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:260
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
@@ -7783,10 +7834,10 @@
 msgstr "再読込"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "選択しているオブジェクトを再読み込みし、リストを更新します。"
 
 #. JButton
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:334
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:774
@@ -7798,149 +7849,140 @@
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Display the history of the selected objects."
 msgstr "選択したオブジェクトの履歴を表示。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66
 msgid "Advanced object info"
 msgstr "詳細なオブジェクト情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77
 msgid "map style"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-msgid "In conflict with:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
-#, java-format
-msgid "Node id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
+#, java-format
+msgid " ({0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:144
+msgid "not in data set"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:191
-msgid " not in data set"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152
+msgid "Node: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:171
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr "ウェイ： "
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
-msgid " incomplete\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157
-#, java-format
-msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:167
-#, java-format
-msgid "Way id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
-#, java-format
-msgid " {0} node; "
-msgid_plural " {0} nodes; "
-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 "<新しいオブジェクト>"
 
-#: ../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 ""
@@ -7950,5 +7992,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 ""
@@ -7957,5 +7999,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 ""
@@ -7965,5 +8007,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -7972,22 +8014,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 ""
@@ -8005,5 +8047,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
@@ -8015,10 +8057,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
@@ -8095,5 +8137,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 "表示/非表示"
@@ -8112,5 +8154,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 "有効化"
@@ -8144,9 +8186,9 @@
 msgstr "このレイヤは現在アクティブではありません（クリックしてアクティブに）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:953
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:974
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -8219,5 +8261,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"
@@ -8260,24 +8302,24 @@
 
 #. group "Relations"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
-#: build/trans_presets.java:4271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:775
+#: build/trans_presets.java:4272
 msgid "Relations"
 msgstr "リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
 msgid "Open a list of all relations."
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:273
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:314
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:352
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40
@@ -8286,5 +8328,5 @@
 msgstr "新規リレーション作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19
@@ -8292,133 +8334,125 @@
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
 msgid "Add the selected relations to the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Set the current selection to the list of selected relations"
 msgstr "現在の選択を選択したリレーションのリストへセットする"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Select relation (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1232
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
 msgid "Add the members of all selected relations to current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:468
 msgid "Select the members of all selected relations"
 msgstr "全ての選択済リレーションのメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
 msgid "Select members (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1263
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr "メンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
 msgid "Download all members of the selected relations"
 msgstr "選択済リレーションの全メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Download members"
 msgstr "メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:818
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:817
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1282
 msgid "Download incomplete members of selected relations"
 msgstr "選択されたリレーションの不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:538
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1284
 msgid "Download incomplete members"
 msgstr "不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:773
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+#: ../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 "選択"
+
+#: ../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:127
-msgid "Open a selection list window."
-msgstr "セレクションリスト　ウインドウを開きます。"
-
-#: ../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 "オブジェクトを検索"
 
+#: ../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 "セレクションへズーム"
 
+#: ../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 "選択した要素にズーム"
 
-#: ../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 "リレーション用エディタを呼び出す"
 
-#: ../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 "選択されたリレーション用にリレーションエディタを呼び出す"
 
-#: ../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 "関連リストから選択"
 
-#: ../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 "リレーション一覧のリレーションを選択。"
 
-#: ../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 "選択"
-
-#: ../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 "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:783
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:782
 #, java-format
 msgid "Selection: {0}"
 msgstr "選択: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
-msgid "Get detailed information on the internal state of the objects."
-msgstr "オブジェクトに内部状態に関して詳細な情報を取得。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
-msgid "Inspect"
-msgstr "検査"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
@@ -8507,11 +8541,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 "妥当性検証ウィンドウを開く"
+
 #: ../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 "妥当性検証ウィンドウを開く"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -8753,5 +8790,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
 msgid "Select in layer"
-msgstr "選択レイヤ"
+msgstr "レイヤーから選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
@@ -8780,5 +8817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
 msgid "Zoom to in layer"
-msgstr "レイヤにズーム"
+msgstr "レイヤー上でズーム"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
@@ -8861,4 +8898,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" />
@@ -8914,8 +8956,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" />
@@ -9700,5 +9738,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
@@ -9709,179 +9747,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
@@ -10328,9 +10367,9 @@
 msgstr "不正な変更セットクエリURLです"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:180
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212
 #, java-format
 msgid "This will change {0} object."
@@ -10338,14 +10377,14 @@
 msgstr[0] "これにより {0} オブジェクトが変更されます"
 
-#: ../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
@@ -10357,5 +10396,5 @@
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:277
 msgid "Change value?"
 msgid_plural "Change values?"
@@ -10363,13 +10402,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 ""
@@ -10378,5 +10417,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
@@ -10385,5 +10424,5 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../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."
@@ -10391,31 +10430,31 @@
 msgstr[0] "これにより、{0} 個のオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:419
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:471
 msgid "Add value?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:554
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:608
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:607
 msgid "Properties for selected objects."
 msgstr "選択したオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10424,63 +10463,87 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
-#: build/trans_presets.java:2746
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661
+#: build/trans_presets.java:2747
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:965
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:968
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1021
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1034
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1046
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1058
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1089
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1091
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1132
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "タグのヘルプについて、OSM wiki を表示します(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 "選択されたオブジェクトのためのwikiヘルプのためにブラウザを起動"
 
-#: ../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 ""
 
@@ -10980,14 +11043,14 @@
 "maxlat）:"
 
-#: ../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."
@@ -10996,43 +11059,43 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
 msgid "Please enter a name for the bookmarked download area."
 msgstr "ブックマークされたエリアの名前を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
 msgid "Name of location"
 msgstr "ロケーション名"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
 msgid "Remove the currently selected bookmarks"
 msgstr "選択中のブックマークを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
 msgid "Rename the currently selected bookmark"
 msgstr "選択中のブックマークの名前を変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:103
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
 msgid "Clear textarea"
 msgstr "テキスト領域を消去"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -11042,10 +11105,10 @@
 "付けてください）"
 
-#: ../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
@@ -11054,15 +11117,15 @@
 msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
 
-#: ../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 "緯度の値は、[-90,90]の範囲にある必要があります。"
 
-#: ../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 "経度の値は[-180,180]の範囲で必須です。"
 
-#: ../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"
@@ -11141,13 +11204,4 @@
 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 "拡大"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102
@@ -11195,7 +11249,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"
@@ -11211,12 +11270,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
@@ -11308,4 +11368,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"
@@ -11343,5 +11405,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 "座標"
@@ -11366,11 +11428,11 @@
 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 ""
@@ -11378,5 +11440,5 @@
 msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:288
 #, java-format
 msgid ""
@@ -11384,9 +11446,9 @@
 msgstr "参照の設定に失敗しました。参照バージョン {0} は履歴で使用できません"
 
-#: ../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 ""
@@ -11472,13 +11534,13 @@
 "<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
 
-#: ../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}"
@@ -12085,5 +12147,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
@@ -12095,11 +12157,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 "レイヤー"
@@ -12119,5 +12181,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 "アップロード"
@@ -12140,5 +12202,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
@@ -12151,5 +12213,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 "新しい変更セットのタグ"
@@ -12168,30 +12230,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 "''{0}'' にアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
 msgid "Upload the changed primitives"
 msgstr "変更されたプリミティブをアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:382
 msgid "Please revise upload comment"
 msgstr "アップロードコメントを修正してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid "Revise"
 msgstr "修正"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid "Continue as is"
 msgstr "そのまま続行"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:385
 msgid ""
 "Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -12208,33 +12270,33 @@
 "もう少し楽になるでしょう。"
 
-#: ../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}"
@@ -12612,5 +12674,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
@@ -12977,5 +13039,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 ""
@@ -12985,65 +13047,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 ""
@@ -13058,45 +13120,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 "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
-
-#: ../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 "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../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 "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../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 "不正なURL？"
-
-#: ../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"
@@ -13104,58 +13140,58 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../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:684
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:638
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../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 "WMS レイヤーを保存"
 
-#: ../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 "WMSレイヤーをファイルから読み込む"
 
-#: ../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 "WMS レイヤーをロード"
 
-#: ../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 "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../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 "ファイルの読み込みエラー"
 
-#: ../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ブックマークをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../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"
@@ -13736,4 +13775,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 "設定でトークンアクセスを保存"
@@ -13895,4 +13935,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"
@@ -13979,8 +14021,4 @@
 msgstr ""
 "OSMのサーバ ''{0}'' に認証されている OAuth 接続トークンを入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
-msgid "Save Access Token to preferences"
-msgstr "アクセストークンをプリファレンスに保存"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
@@ -14363,26 +14401,26 @@
 msgstr "ユーザ情報を参照中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722
 msgid "Menu Name"
 msgstr "メニューの名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:88
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:89
 msgid "Unnamed Imagery Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:95
 msgid "WMS"
 msgstr "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 "サービスURL"
 
-#: ../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"
@@ -14390,49 +14428,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
-#: ../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
+#: ../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 "WMSエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:170
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:178
+#: ../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:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:181
 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 "TMS URL"
 
-#: ../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 "TMS"
 
-#: ../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 "画像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 "WMSレイヤ一覧をパースできません。"
 
-#: ../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 "不正なサービスURL。"
 
-#: ../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 "WMSレイヤ一覧を参照できません。"
@@ -14656,5 +14693,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}"
@@ -14790,5 +14827,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
@@ -14856,5 +14893,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 "自動車"
@@ -14880,14 +14917,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 "自転車"
@@ -14926,13 +14963,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 "徒歩"
@@ -15081,113 +15118,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 "WMS設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257
 msgid "TMS Settings"
 msgstr "TMS設定"
 
-#: ../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
@@ -15198,55 +15239,55 @@
 msgstr "新規"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:447
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:599
 msgid "Add a new WMS/TMS entry by entering the URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:455
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:607
 msgid "Add Imagery URL"
 msgstr "画像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 "画像URL（既定値）"
 
-#: ../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 "EULAライセンスURLが使えません:{0}"
 
-#: ../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 "EULAライセンスに対する不正なURL: {0}"
 
-#: ../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 "縦座標値"
@@ -15830,7 +15871,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 "リセット"
@@ -16417,5 +16460,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 ""
@@ -16424,5 +16467,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 ""
@@ -16462,28 +16505,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 "グループ \"{1}\"のプリセット\"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1032
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "プリセット \"{0}\"を使います"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1150
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1171
 msgid "Preset role element without parent"
 msgstr "親の無いロール要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1158
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1179
 msgid "Preset sub element without parent"
 msgstr "親の無いサブ要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1198
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1219
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -16493,15 +16536,15 @@
 msgstr "タグ付けプリセットのソース {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 "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1270
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1328
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1349
 #: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
@@ -16510,22 +16553,22 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1364
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
 msgid "New relation"
 msgstr "新しいリレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1434
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1455
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16592,4 +16635,42 @@
 "現在の値は正しいOSMのIDではありません。ゼロより大きい整数値を入力してくださ"
 "い。"
+
+#: ../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 ""
+"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
+
+#: ../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 "削除されたノード {0} はウェイ {1} の一部です"
+
+#: ../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 ""
+"外部ID ''{0}'' のリレーションは外部ID ''{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 "削除されたメンバー {0} はリレーション {1} で使われています"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -17194,5 +17275,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
@@ -17315,5 +17396,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
@@ -17324,5 +17404,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
@@ -17351,4 +17431,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
@@ -17396,14 +17477,14 @@
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../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
@@ -17413,10 +17494,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 "<way> 要素を直接引き継いでない XML 要素の <nd> が見つかった。"
-
-#: ../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 "削除されたウェイ {0} にはノードがあります"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
@@ -17425,5 +17507,5 @@
 msgstr "ウェイ {1} の<nd>上に必要な属性 ''{0}'' がありません。"
 
-#: ../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
@@ -17433,17 +17515,11 @@
 msgstr "要素 <nd> の属性 ''ref'' に不正な値。入力値: {0}。"
 
-#: ../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 "削除されたウェイ {0} にはノードがあります"
-
-#: ../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 ""
-"要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
-
-#: ../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 "削除されたリレーション {0} にはメンバーがあります"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
 #, java-format
@@ -17451,5 +17527,5 @@
 msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
 
-#: ../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
@@ -17457,5 +17533,5 @@
 msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {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
@@ -17464,5 +17540,5 @@
 msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
 
-#: ../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
@@ -17473,21 +17549,15 @@
 "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {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 "ref=0の不完全な<member>指定です。"
 
-#: ../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 "削除されたリレーション {0} にはメンバーがあります"
-
-#: ../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
@@ -17496,5 +17566,5 @@
 msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。"
 
-#: ../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
@@ -17502,6 +17572,6 @@
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334
@@ -17514,8 +17584,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
@@ -17531,5 +17601,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
@@ -17537,5 +17607,5 @@
 msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
 
-#: ../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
@@ -17544,6 +17614,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
@@ -17559,6 +17629,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
@@ -17569,5 +17639,5 @@
 msgstr "属性 ''changeset'' に不正な値。入力値 {0}。"
 
-#: ../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
@@ -17576,5 +17646,5 @@
 msgstr "必要な属性 ''{0}'' がありません。"
 
-#: ../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
@@ -17583,55 +17653,19 @@
 msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
 
-#: ../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 ""
-"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
-
-#: ../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 "削除されたノード {0} はウェイ {1} の一部です"
-
-#: ../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 ""
-"外部ID ''{0}'' のリレーションは外部ID ''{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 "削除されたメンバー {0} はリレーション {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 "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:542
 msgid "Parsing OSM data..."
 msgstr "OSMデータ解析中..."
 
-#: ../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
@@ -17786,4 +17820,33 @@
 msgstr "osmプリミティブに予期しないID 0が見つかりました"
 
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "gzip圧縮したOSMファイル"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "不正な日付"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "変更セット {0} を閉じています"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, fuzzy, java-format
+msgid "Invalid timestamp: {0}"
+msgstr "不正な URL {0}"
+
+#: ../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 "OSMデータ解析中..."
+
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
@@ -17807,11 +17870,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
@@ -17828,31 +17884,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 "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。"
-
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:149
-#, java-format
-msgid "Warning: The complete URL is ''{0}''."
-msgstr "警告: 完全なURL は ''{0}'' です。"
-
-#: ../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 ""
-"URL中の投影法 ''{0}'' は現在の投影法 ''{1}'' と一致しません。\n"
-"間違った座標にたどりつく可能性があります。"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -18682,10 +18711,10 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../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 "Unable to find translation for the locale {0}. Reverting to {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
@@ -18697,5 +18726,5 @@
 "動作停止します。"
 
-#: ../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
@@ -18704,6 +18733,6 @@
 msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {1}"
 
-#: ../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 ""
@@ -18744,5 +18773,5 @@
 msgstr "未使用"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18756,5 +18785,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"
@@ -18764,5 +18793,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18773,5 +18802,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 "(ヒント:設定でショートカットキーを選べます。)"
@@ -19428,16 +19457,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 "
@@ -19450,15 +19484,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 "
@@ -19468,5 +19502,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -19475,10 +19509,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 "
@@ -19487,10 +19521,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
 #. 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 "
@@ -19499,5 +19533,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."
@@ -19505,5 +19539,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 "
@@ -19513,5 +19547,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 "
@@ -19523,25 +19557,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 "4 または5のウェイのセットに左折禁止を追加"
 
 #. 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. "
@@ -19550,5 +19584,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 "
@@ -19561,10 +19595,10 @@
 
 #. 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 ""
@@ -19573,5 +19607,5 @@
 
 #. 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"
@@ -19579,5 +19613,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."
@@ -19587,10 +19621,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 "
@@ -19601,5 +19635,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 "
@@ -19610,15 +19644,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. 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."
@@ -19626,25 +19660,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 "
@@ -19654,5 +19688,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 "
@@ -19664,10 +19698,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 "
@@ -19677,20 +19711,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 "openSeaMap用の海図を作成・編集"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. 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 "
@@ -19703,15 +19737,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. 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). "
@@ -19720,5 +19754,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) "
@@ -19727,10 +19761,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."
@@ -19738,5 +19772,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19745,15 +19779,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. 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 "
@@ -19763,5 +19797,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19772,20 +19806,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 "
@@ -19950,9 +19984,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 "道路番号"
@@ -20005,6 +20039,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 "最高速度（km/h）"
@@ -20053,9 +20087,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 "一方通行"
@@ -20105,9 +20139,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 "橋"
@@ -20148,9 +20182,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 "トンネル"
@@ -20189,9 +20223,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 "切り通し"
@@ -20230,9 +20264,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 "土手"
@@ -20271,9 +20305,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 ""
@@ -20359,4 +20393,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"
@@ -20374,8 +20409,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 "坂"
@@ -20395,4 +20431,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
@@ -20410,8 +20447,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 ""
@@ -20431,4 +20469,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
@@ -20446,8 +20485,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 ""
@@ -20467,4 +20507,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
@@ -20482,8 +20523,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 ""
@@ -20503,4 +20545,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
@@ -20518,8 +20561,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 ""
@@ -20592,5 +20636,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 "対向車待機所"
@@ -20622,10 +20666,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 "幅(m)"
@@ -20667,9 +20711,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 "表面"
@@ -20694,9 +20738,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 "舗装"
@@ -20720,9 +20764,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 "未舗装"
@@ -20746,9 +20790,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 "アスファルト"
@@ -20773,9 +20817,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 "コンクリート"
@@ -20800,9 +20844,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 "金属"
@@ -20822,4 +20866,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
@@ -20828,10 +20873,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 "森"
@@ -20855,9 +20900,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 "敷石"
@@ -20882,9 +20927,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 "敷石"
@@ -20909,9 +20954,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 "砂利道"
@@ -20935,9 +20980,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 "小石"
@@ -20961,9 +21006,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 "圧縮"
@@ -20987,9 +21032,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 "敷石混じりの芝"
@@ -21014,9 +21059,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 "草地"
@@ -21041,9 +21086,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 "砂地"
@@ -21069,10 +21114,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 "地表"
@@ -21223,5 +21268,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 "ロータリー交差点"
@@ -21375,64 +21420,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
@@ -21508,8 +21553,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"
@@ -21539,8 +21584,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 ""
@@ -21590,9 +21635,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"
@@ -21635,9 +21680,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"
@@ -21658,7 +21703,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 "農業の"
@@ -21678,7 +21723,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 ""
@@ -21818,61 +21863,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
@@ -21906,10 +21951,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 ""
@@ -21941,10 +21986,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 "指定済み"
@@ -21963,11 +22008,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 "馬"
@@ -21985,5 +22030,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 ""
@@ -22004,12 +22049,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 "バイク"
@@ -22027,10 +22072,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 "自動車"
@@ -22130,6 +22175,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 "自動車専用道路"
@@ -22137,5 +22182,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 "自動車専用道路の連結路"
@@ -22155,6 +22200,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 "国道"
@@ -22162,5 +22207,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 "国道の連絡路"
@@ -22180,6 +22225,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 "主要地方道"
@@ -22187,5 +22232,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 "主要地方道の連絡路"
@@ -22205,6 +22250,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 "一般地方道"
@@ -22224,6 +22269,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 "一般道(2車線以上)"
@@ -22231,5 +22276,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 "一般道(2車線未満)"
@@ -22243,6 +22288,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 "居住区域内道路"
@@ -22250,5 +22295,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 "私道"
@@ -22289,6 +22334,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 "敷地内道路"
@@ -22296,5 +22341,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 "バスレーン"
@@ -22319,7 +22364,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 "工事中"
@@ -22355,11 +22400,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "浅瀬（洗い越し）"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "浅瀬（歩いて渡る）"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "ウェイ"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr "トラック"
@@ -22368,35 +22424,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:531
+#: build/trans_presets.java:541
 msgid "Edit Track"
 msgstr "トラックの編集"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "Tracktype"
 msgstr "トラック種別"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade1"
 msgstr "grade1"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade2"
 msgstr "grade2"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade3"
 msgstr "grade3"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade4"
 msgstr "grade4"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade5"
 msgstr "grade5"
@@ -22404,10 +22460,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スケール"
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:546
+#: build/trans_presets.java:556
 msgid "General access"
 msgstr ""
@@ -22415,5 +22471,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr "小道"
@@ -22422,50 +22478,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 "SACスケール"
 
 #. 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, "
@@ -22474,5 +22530,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 "
@@ -22482,5 +22538,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 "
@@ -22489,5 +22545,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, "
@@ -22496,5 +22552,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, "
@@ -22504,5 +22560,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"
@@ -22510,10 +22566,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 "有効"
@@ -22521,15 +22577,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 ""
@@ -22552,23 +22608,23 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:581 build/trans_presets.java:1956
-#: build/trans_presets.java:1974 build/trans_presets.java:1990
-#: build/trans_presets.java:2007 build/trans_presets.java:2025
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2081 build/trans_presets.java:2104
-#: build/trans_presets.java:2123 build/trans_presets.java:2140
-#: build/trans_presets.java:2159 build/trans_presets.java:2178
-#: build/trans_presets.java:2194 build/trans_presets.java:2211
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:591 build/trans_presets.java:1957
+#: build/trans_presets.java:1975 build/trans_presets.java:1991
+#: build/trans_presets.java:2008 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2060
+#: build/trans_presets.java:2082 build/trans_presets.java:2105
+#: build/trans_presets.java:2124 build/trans_presets.java:2141
+#: build/trans_presets.java:2160 build/trans_presets.java:2179
+#: build/trans_presets.java:2195 build/trans_presets.java:2212
+#: build/trans_presets.java:2227
 msgid "Wheelchairs"
 msgstr "車いす"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:582
+#: build/trans_presets.java:592
 msgid "Ski"
 msgstr "スキー"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr "スノーモービル"
@@ -22577,5 +22633,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr "馬車専用道"
@@ -22583,5 +22639,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 "馬道の編集"
@@ -22589,5 +22645,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -22595,10 +22651,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 ""
@@ -22607,6 +22663,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 ""
@@ -22657,27 +22713,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 "トラック"
@@ -22686,6 +22742,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 ""
@@ -22694,6 +22750,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 ""
@@ -22702,6 +22758,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 ""
@@ -22710,6 +22766,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 ""
@@ -22718,21 +22774,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 ""
@@ -22740,15 +22796,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 "自転車専用道"
@@ -22766,11 +22822,11 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:628 build/trans_presets.java:650
-#: build/trans_presets.java:674
+#: build/trans_presets.java:638 build/trans_presets.java:660
+#: build/trans_presets.java:684
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr "歩行者専用道路"
@@ -22778,5 +22834,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr "分割された歩行者および自転車道"
@@ -22784,5 +22840,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr "統合された歩行者および自転車道"
@@ -22790,5 +22846,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr "遊歩道"
@@ -22797,5 +22853,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 "遊歩道の編集"
@@ -22803,5 +22859,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "階段"
@@ -22811,10 +22867,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:719
+#: build/trans_presets.java:729
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr "階段の段数"
@@ -22822,5 +22878,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"
@@ -22828,5 +22884,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
@@ -22834,10 +22890,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:740
+#: build/trans_presets.java:750
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:744
+#: build/trans_presets.java:754
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22846,10 +22902,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 "敷地内道路"
@@ -22857,5 +22913,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 "サービスステーションの編集"
@@ -22949,42 +23005,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 "運営者"
@@ -22993,6 +23049,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 "トイレ"
@@ -23000,5 +23056,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -23006,5 +23062,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 ""
@@ -23012,5 +23068,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -23020,5 +23076,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -23028,5 +23084,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 "横断歩道タイプ"
@@ -23035,6 +23091,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 "マークだけ"
@@ -23043,6 +23099,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 "信号機"
@@ -23051,6 +23107,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 "途中に島あり"
@@ -23059,6 +23115,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 "マークなし"
@@ -23067,6 +23123,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 "馬用横断道"
@@ -23075,6 +23131,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 "自転車用横断歩道"
@@ -23083,11 +23139,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 "踏切タイプ名(UK)"
@@ -23095,5 +23151,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 "横断歩道"
@@ -23101,5 +23157,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 "ペリカン柄横断歩道（ＵＫ）"
@@ -23107,5 +23163,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 "Toucan柄横断歩道（ＵＫ）"
@@ -23113,5 +23169,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 "ツノメドリ"
@@ -23119,5 +23175,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 "ペガサス柄横断歩道（ＵＫ）"
@@ -23125,5 +23181,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 "虎縞柄横断歩道（ＵＫ）"
@@ -23131,5 +23187,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr "停止"
@@ -23137,5 +23193,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -23146,15 +23202,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 "横断歩道"
@@ -23163,15 +23219,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:797
+#: build/trans_presets.java:807
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr "交通静穏化"
@@ -23179,40 +23235,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:817
 msgid "Edit Traffic Calming"
 msgstr "交通静穏化を編集"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "bump"
 msgstr "段差"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "chicane"
 msgstr "シケイン"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "choker"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "cushion"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "hump"
 msgstr "ハンプ"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "table"
 msgstr ""
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:820
 msgid "Passing Place"
 msgstr "対向車待機所"
@@ -23220,5 +23276,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 "対向車待機所を編集"
@@ -23226,5 +23282,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 "転回場"
@@ -23234,5 +23290,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 "市境界標識"
@@ -23240,15 +23296,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
 #. item "Waypoints/City Limit" label "Edit City Limit Sign"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:832
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:837
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:839
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -23258,5 +23314,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr "凍結防止用のグリット入れ"
@@ -23265,17 +23321,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "浅瀬（洗い越し）"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "浅瀬（歩いて渡る）"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -23283,5 +23328,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 "峠道の編集"
@@ -23293,7 +23338,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 "高度"
@@ -23328,18 +23373,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 "Wikipedia"
@@ -23347,5 +23392,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "ゲート等"
@@ -23353,5 +23398,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr "車止め杭"
@@ -23359,5 +23404,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 "bollardの編集"
@@ -23407,22 +23452,22 @@
 #. <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 "ブロック"
@@ -23430,5 +23475,5 @@
 # http://en.wikipedia.org/wiki/Cattle_grid
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:895
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -23436,5 +23481,5 @@
 #. <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 "Cattle Gridの編集"
@@ -23442,5 +23487,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -23448,15 +23493,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 "料金所"
@@ -23464,5 +23509,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 "料金所の編集"
@@ -23470,10 +23515,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 "国境検査所の編集"
@@ -23482,5 +23527,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "生け垣"
@@ -23489,24 +23534,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr "フェンス"
 
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#. item "Barriers/Wire Fence"
-#: build/trans_presets.java:953
-msgid "Wire Fence"
-msgstr ""
-
-#. <key key="barrier" value="wire_fence" />
-#. item "Barriers/Wood Fence"
-#: build/trans_presets.java:956
-msgid "Wood Fence"
-msgstr ""
-
-#. <key key="barrier" value="wood_fence" />
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "barbed_wire"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "chain"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#. item "Leisure/Public Grill" combo "Fuel" display value
+#: build/trans_presets.java:955 build/trans_presets.java:2398
+msgid "electric"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "hedge"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Type" display value
+#. item "Facilities/Clock" combo "Support" display value
+#: build/trans_presets.java:955 build/trans_presets.java:2677
+msgid "pole"
+msgstr "電柱"
+
+#. item "Barriers/Fence" combo "Type" display value
+#: build/trans_presets.java:955
+msgid "split_rail"
+msgstr ""
+
+#. </optional>
 #. item "Barriers/Wall"
-#: build/trans_presets.java:959
+#: build/trans_presets.java:958
 msgid "Wall"
 msgstr "壁"
@@ -23514,5 +23578,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "城壁"
@@ -23521,5 +23585,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 "擁壁"
@@ -23530,15 +23594,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:972
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:973
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr "ゲート"
@@ -23546,50 +23610,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:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1009
 msgid "Hampshire Gate"
 msgstr "ワイヤゲート"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1010
 msgid "Edit Hampshire Gate"
 msgstr "ワイヤゲートの編集"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1021
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1022
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1033
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1034
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
 msgstr "踏み越し段"
@@ -23597,25 +23661,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 "Stileの編集"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1052
 msgid "Turnstile"
 msgstr "回転式木戸"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1053
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1061
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1062
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -23625,6 +23689,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 "水域(湖沼)"
@@ -23632,5 +23696,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "側溝"
@@ -23638,10 +23702,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 "川(drain)の編集"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr "溝渠"
@@ -23649,10 +23713,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 "小川"
@@ -23660,10 +23724,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 "運河"
@@ -23671,10 +23735,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 "川"
@@ -23684,5 +23748,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 "河川の編集"
@@ -23690,5 +23754,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "泉"
@@ -23696,20 +23760,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1126
 msgid "Edit Spring"
 msgstr "泉の編集"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "滝"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "堰"
@@ -23717,10 +23781,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1139
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "ダム"
@@ -23728,10 +23792,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 ""
@@ -23739,5 +23803,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 ""
@@ -23747,5 +23811,5 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1159
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -23753,10 +23817,10 @@
 # 水たまりになるような土地
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1160
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "ため池"
@@ -23764,15 +23828,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1167
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1172
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1173
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -23780,20 +23844,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1180
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "陸地の編集"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "海岸線"
@@ -23801,10 +23865,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1191
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "川岸"
@@ -23813,5 +23877,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 "川岸の編集"
@@ -23819,5 +23883,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "湿地帯"
@@ -23828,15 +23892,15 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1209
+#: build/trans_presets.java:1208
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "沼地"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr "湿地"
@@ -23849,40 +23913,40 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1212 build/trans_style.java:2930
+#: build/trans_presets.java:1211 build/trans_style.java:2945
 msgid "marsh"
 msgstr "沼地、湿地"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr "葦原"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr "塩湖"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr "干潟"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "マングローブ"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "泥地"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "砂浜"
@@ -23890,20 +23954,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1220
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "湾"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "崖"
@@ -23911,15 +23975,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1231
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. group "Shipping"
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1236
 msgid "Shipping"
 msgstr "港湾関連"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1237
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -23927,20 +23991,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1239
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "Cargo"
 msgstr "荷物"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers"
 msgstr "旅行者"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "vehicle"
 msgstr "車両"
@@ -24026,26 +24090,26 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1243 build/trans_presets.java:4330
-#: build/trans_presets.java:4360 build/trans_style.java:189
-#: build/trans_style.java:525 build/trans_style.java:545
-#: build/trans_style.java:551 build/trans_style.java:570
-#: build/trans_style.java:577 build/trans_style.java:753
-#: build/trans_style.java:759 build/trans_style.java:765
-#: build/trans_style.java:771 build/trans_style.java:777
+#: build/trans_presets.java:1242 build/trans_presets.java:4332
+#: build/trans_presets.java:4362 build/trans_style.java:189
+#: build/trans_style.java:519 build/trans_style.java:539
+#: build/trans_style.java:545 build/trans_style.java:564
+#: build/trans_style.java:571 build/trans_style.java:747
+#: build/trans_style.java:753 build/trans_style.java:759
+#: build/trans_style.java:765 build/trans_style.java:771
 msgid "bicycle"
 msgstr "自転車"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "hgv"
 msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers;vehicle"
 msgstr "旅行者;車両"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1244
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -24053,5 +24117,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 "フェリー航路の編集"
@@ -24060,15 +24124,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "桟橋"
@@ -24076,10 +24140,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1261
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -24088,5 +24152,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 "転回地点"
@@ -24096,5 +24160,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
@@ -24104,10 +24168,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 "ボートヤード(陸上の船置き場)"
@@ -24115,10 +24179,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 "ドック"
@@ -24126,20 +24190,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 "輸送"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1299
 msgid "Railway"
 msgstr "鉄道"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "線路"
@@ -24147,5 +24211,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 "線路の編集"
@@ -24175,7 +24239,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 "軌間(mm)"
@@ -24191,8 +24255,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 "タイプ"
@@ -24206,8 +24270,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 "ヤード"
@@ -24221,8 +24285,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 "待避線"
@@ -24236,8 +24300,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 "分岐線"
@@ -24250,8 +24314,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 "電化状態"
@@ -24264,8 +24328,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 "架線"
@@ -24294,4 +24358,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
@@ -24326,12 +24397,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
@@ -24349,9 +24421,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 "電圧"
@@ -24364,8 +24436,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 "周波数 (Hz)"
@@ -24378,8 +24450,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"
@@ -24387,10 +24459,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1314
+#: 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:1315
+#: build/trans_presets.java:1314
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
@@ -24398,5 +24470,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "モノレール"
@@ -24404,5 +24476,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 "モノレールの編集"
@@ -24410,10 +24482,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1337
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1338
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
@@ -24421,10 +24493,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1349
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1350
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
@@ -24432,10 +24504,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
@@ -24443,10 +24515,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
@@ -24454,5 +24526,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -24460,5 +24532,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 "バス車線の編集"
@@ -24467,10 +24539,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
@@ -24479,10 +24551,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 "廃棄された線路"
@@ -24491,5 +24563,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr "踏切"
@@ -24498,5 +24570,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -24506,5 +24578,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -24512,5 +24584,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -24519,5 +24591,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 "車止め"
@@ -24526,10 +24598,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "リフト"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -24537,5 +24609,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 "いすリフトの編集"
@@ -24557,12 +24629,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 "参照番号"
@@ -24588,14 +24660,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 ""
@@ -24613,10 +24685,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 ""
@@ -24624,5 +24696,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 ""
@@ -24632,6 +24704,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 ""
@@ -24639,5 +24711,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -24645,5 +24717,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 "Tバーリフト"
@@ -24651,5 +24723,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -24657,10 +24729,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1466
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Number of people per car"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1472
 msgid "Number of people per car"
 msgstr ""
@@ -24668,5 +24740,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr "ゴンドラ"
@@ -24674,10 +24746,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 ""
@@ -24685,5 +24757,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24691,10 +24763,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 ""
@@ -24702,5 +24774,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24708,5 +24780,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 ""
@@ -24714,5 +24786,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24720,5 +24792,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 ""
@@ -24726,5 +24798,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24732,5 +24804,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 ""
@@ -24738,5 +24810,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24744,5 +24816,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 ""
@@ -24750,5 +24822,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24756,5 +24828,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 ""
@@ -24762,5 +24834,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24768,5 +24840,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24776,5 +24848,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24783,5 +24855,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"
@@ -24789,5 +24861,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24796,5 +24868,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"
@@ -24812,6 +24884,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 "駐車場"
@@ -24820,5 +24892,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 "駐車場の編集"
@@ -24826,5 +24898,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 "多階の建物"
@@ -24832,5 +24904,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 "表面"
@@ -24838,10 +24910,10 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1592 build/trans_presets.java:1705
+#: build/trans_presets.java:1591 build/trans_presets.java:1704
 msgid "underground"
 msgstr "地下"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -24852,7 +24924,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 "料金"
@@ -24860,25 +24932,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1595
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1596
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1597
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1598
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
 #. 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 "他の収容能力はWiki を参照:[types]=*。"
@@ -24886,5 +24958,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -24894,5 +24966,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 "ガソリンスタンドの編集"
@@ -24905,117 +24977,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 ""
 
 #. 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 "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 "エッソ"
 
 #. 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 "シェル石油"
 
 #. 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 ""
@@ -25108,48 +25180,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 "営業時間"
@@ -25240,47 +25312,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"
@@ -25372,47 +25444,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 "月-金 08:30-20:00"
@@ -25482,126 +25554,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 "火-日 8:00-15:00;土 8:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "With shop"
 msgstr "店舗あり"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "convenience"
 msgstr ""
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "kiosk"
 msgstr "売店"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1614
 msgid "Fuel types:"
 msgstr "燃料の種類:"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1615
 msgid "Diesel"
 msgstr "ディーゼル"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1616
 msgid "Bio Diesel"
 msgstr "バイオ燃料(ディーゼル)"
 
 #. 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"
+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)"
-#: build/trans_presets.java:1624
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10%エタノール混合)"
 
 #. 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(85%エタノール混合)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1625
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPGガス"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1626
 msgid "CNG (Compressed Natural Gas)"
 msgstr "天然ガス"
 
 #. 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 ""
@@ -25609,5 +25681,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -25615,20 +25687,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
 #. item "Car/Charging Station" label "Edit Charging Station (for electric cars)"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1633
 msgid "Edit Charging Station (for electric cars)"
 msgstr ""
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1637
 msgid "Amperage"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1639
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -25636,5 +25708,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr "カーディーラ"
@@ -25642,5 +25714,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 "自動車パーツショップの編集"
@@ -25648,20 +25720,20 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1656 build/trans_presets.java:1719
+#: build/trans_presets.java:1655 build/trans_presets.java:1718
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1663
 msgid "Tyres"
 msgstr "タイヤ店"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1664
 msgid "Edit Tyres"
 msgstr "タイヤ店の編集"
@@ -25669,5 +25741,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 "連絡先:"
@@ -25711,15 +25783,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 "電話番号"
@@ -25744,14 +25816,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 "Fax番号"
@@ -25779,15 +25851,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 "Webサイト"
@@ -25812,14 +25884,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メールアドレス"
@@ -25829,6 +25901,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 "レンタル"
@@ -25837,10 +25909,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1680
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -25848,5 +25920,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 "カーシェアリング"
@@ -25855,16 +25927,16 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1693 build/trans_presets.java:1704
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1692 build/trans_presets.java:1703
+#: build/trans_presets.java:1736
 msgid "Capacity"
 msgstr "収容台数"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1700
 msgid "Edit Motorcycle Parking"
 msgstr "バイク駐車場の編集"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
 msgstr "バイク店"
@@ -25872,25 +25944,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"
@@ -25898,5 +25970,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25904,5 +25976,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25910,5 +25982,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25919,6 +25991,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 "ブランド(メーカー)"
@@ -25926,35 +25998,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:1720
+#: 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 "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 "部品"
@@ -25964,6 +26036,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 "被服"
@@ -25971,10 +26043,56 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1734
+#: build/trans_presets.java:1733
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "anchors"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "ground_slots"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "informal"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "lockers"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "shed"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "sheffield"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "stands"
+msgstr ""
+
+#. item "Bicycle/Parking" combo "Type" display value
+#: build/trans_presets.java:1737
+msgid "wall_loops"
+msgstr ""
+
+#. item "Bicycle/Parking" check "Covered"
+#. item "Leisure/Public Grill" combo "Covered"
+#: build/trans_presets.java:1738 build/trans_presets.java:2397
+msgid "Covered"
+msgstr ""
+
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1740
 msgid "Bike Dealer"
 msgstr "自転車屋"
@@ -25983,40 +26101,40 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1743
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1746
 msgid "Bicycles are sold"
 msgstr "新品自転車を販売"
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1747
 msgid "Second-hand bicycles are sold"
 msgstr "リサイクル自転車を販売"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Bicycles are repaired"
 msgstr "自転車修理対応"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1749
 msgid "Bicycles are rented"
 msgstr "レンタル自転車取り扱い"
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1750
 msgid "Free bicycle pump"
 msgstr "無料の空気ポンプ"
 
 #. item "Bicycle/Bike Dealer" check "Tools for do-it-yourself repair (may be a bike co-operative)"
-#: build/trans_presets.java:1750
+#: build/trans_presets.java:1751
 msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
 msgstr "DIY修理のための道具(自転車の協同組合かもしれない)"
 
 #. 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 "自転車の洗浄(無料で)"
@@ -26025,10 +26143,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1757
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1761
+#: build/trans_presets.java:1762
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -26036,5 +26154,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -26044,5 +26162,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"
@@ -26050,5 +26168,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -26056,5 +26174,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr "停車場"
@@ -26062,5 +26180,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 "停止線の編集"
@@ -26068,5 +26186,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -26075,5 +26193,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 "トラム停車場の編集"
@@ -26081,5 +26199,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -26088,5 +26206,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 "鉄道のプラットホームの編集"
@@ -26098,5 +26216,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 "リファレンス (ホームの番号)"
@@ -26105,11 +26223,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 "地下鉄の入口"
@@ -26118,5 +26236,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 "地下鉄入口の編集"
@@ -26124,5 +26242,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 "車いす"
@@ -26131,5 +26249,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -26138,5 +26256,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 "バスターミナルの編集"
@@ -26144,5 +26262,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "バス停"
@@ -26152,5 +26270,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 "バス停の編集"
@@ -26159,6 +26277,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
@@ -26170,10 +26288,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 "点字ブロック"
@@ -26181,10 +26299,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 "バス乗り場の編集"
@@ -26192,10 +26310,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 ""
@@ -26204,6 +26322,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 "コイン"
@@ -26212,6 +26330,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 "備考"
@@ -26220,6 +26338,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 "電子マネー"
@@ -26228,6 +26346,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 "デビットカード"
@@ -26236,6 +26354,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 "クレジットカード"
@@ -26243,10 +26361,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 "タクシー"
@@ -26254,5 +26372,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 "タクシー乗り場の編集"
@@ -26260,10 +26378,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 "飛行場の地面"
@@ -26271,5 +26389,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 "飛行場の地面の編集"
@@ -26277,10 +26395,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"
@@ -26289,5 +26407,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr "滑走路"
@@ -26295,5 +26413,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 "滑走路の編集"
@@ -26301,5 +26419,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr "誘導路"
@@ -26307,5 +26425,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 "誘導路の編集"
@@ -26313,5 +26431,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr "ヘリパッド"
@@ -26319,5 +26437,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 "ヘリパッドの編集"
@@ -26327,5 +26445,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 "エプロン"
@@ -26335,5 +26453,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 "格納庫"
@@ -26344,6 +26462,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 "ビーコン"
@@ -26353,5 +26471,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 "吹き流し"
@@ -26360,5 +26478,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr "ターミナル"
@@ -26366,10 +26484,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"
@@ -26378,15 +26496,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 "宿泊施設"
@@ -26398,5 +26516,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 "ホテル"
@@ -26405,5 +26523,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 "ホテルの編集"
@@ -26417,8 +26535,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 "星の数"
@@ -26454,12 +26572,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 "インターネットアクセス"
@@ -26480,12 +26598,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 "無線LAN"
@@ -26506,12 +26624,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 "有線LAN"
@@ -26538,12 +26656,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 "駅"
@@ -26564,12 +26682,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 "インターネットアクセス費用"
@@ -26592,12 +26710,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 "喫煙"
@@ -26619,12 +26737,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 ""
@@ -26646,12 +26764,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 "分離された"
@@ -26673,17 +26791,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 "モーテル"
@@ -26691,20 +26809,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1966
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -26712,10 +26830,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 "ホステル"
@@ -26723,15 +26841,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 "山小屋の編集"
@@ -26739,10 +26857,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 "ハウストレーラー用駐車場の編集"
@@ -26750,30 +26868,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 "キャンプ場"
@@ -26781,10 +26899,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2074
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -26795,5 +26913,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 "レストラン"
@@ -26801,5 +26919,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 "レストランの編集"
@@ -26808,6 +26926,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 "料理の種類"
@@ -26815,5 +26933,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 "イタリアン"
@@ -26821,5 +26939,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 "中国料理"
@@ -26827,5 +26945,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 "ピザ"
@@ -26833,5 +26951,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 "バーガー"
@@ -26839,5 +26957,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 "ギリシャ料理"
@@ -26845,5 +26963,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 "ドイツ料理"
@@ -26851,5 +26969,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 "インド料理"
@@ -26857,5 +26975,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 "郷土料理"
@@ -26863,5 +26981,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 "カバブ"
@@ -26869,5 +26987,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 "トルコ料理"
@@ -26875,5 +26993,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 "アジア各国料理"
@@ -26881,5 +26999,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 "タイ料理"
@@ -26887,5 +27005,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 "メキシコ料理"
@@ -26893,5 +27011,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 "日本食"
@@ -26899,5 +27017,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 "フレンチ"
@@ -26905,5 +27023,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 "サンドイッチ"
@@ -26911,5 +27029,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 "寿司"
@@ -26917,10 +27035,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 "ファーストフード"
@@ -26928,20 +27046,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2114
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "fish_and_chips"
 msgstr "フィッシュ・アンド・チップス"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "chicken"
 msgstr "チキン"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2131
 msgid "Food Court"
 msgstr "フードコート"
@@ -26949,10 +27067,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 "カフェ"
@@ -26960,15 +27078,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2150
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "ice_cream"
 msgstr "アイスクリーム"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2167
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -26976,20 +27094,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 "バー"
@@ -26997,10 +27115,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 "ナイトクラブ"
@@ -27008,25 +27126,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2221
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "旅行"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -27034,10 +27152,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 "View pointの編集"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
@@ -27045,20 +27163,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "案内所"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "地形"
@@ -27091,32 +27209,32 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2261 build/trans_presets.java:4401
-#: build/trans_style.java:477 build/trans_style.java:489
-#: build/trans_style.java:501 build/trans_style.java:507
+#: build/trans_presets.java:2262 build/trans_presets.java:4403
+#: build/trans_style.java:471 build/trans_style.java:483
+#: build/trans_style.java:495 build/trans_style.java:501
 msgid "street"
 msgstr "ストリート"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr "スキーム"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr "サイト"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "市区"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "地方"
@@ -27125,6 +27243,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 "詳細な説明"
@@ -27134,5 +27252,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 "表示されたルート:"
@@ -27140,5 +27258,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 "ハイキング"
@@ -27147,6 +27265,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 "サイクリング"
@@ -27154,5 +27272,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 "マウンテンバイク"
@@ -27161,6 +27279,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 "スキー"
@@ -27168,5 +27286,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 "乗馬"
@@ -27174,50 +27292,50 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2271 build/trans_presets.java:2294
+#: build/trans_presets.java:2272 build/trans_presets.java:2295
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "notice"
 msgstr "通知"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "history"
 msgstr "履歴"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "自然"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
 msgstr "野生生物"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2282
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2297
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -27225,10 +27343,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2301 build/trans_presets.java:2311
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
 msgid "Closer description"
 msgstr "詳細な説明"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr "音声ガイド"
@@ -27236,25 +27354,25 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2317
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "レジャー"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "映画館"
@@ -27263,10 +27381,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2331
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "動物園"
@@ -27275,10 +27393,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2338
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -27287,45 +27405,45 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2347
 msgid "Edit Dog Park"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Barrier"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "fence"
 msgstr "フェンス"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "wall"
 msgstr ""
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2355
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr "サウナ"
@@ -27335,5 +27453,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 "サウナの編集"
@@ -27361,20 +27479,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 "火-日 08:00-15:00; 土 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Access"
 msgstr "アクセス"
@@ -27382,5 +27500,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "遊び場"
@@ -27388,15 +27506,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2381
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
@@ -27404,10 +27522,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 ""
@@ -27415,15 +27533,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"
@@ -27431,30 +27544,25 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "charcoal"
 msgstr ""
 
-#. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
-msgid "electric"
-msgstr ""
-
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2400
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. group "Culture"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2406
 msgid "Culture"
 msgstr "文化"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Museum"
 msgstr "博物館"
@@ -27462,10 +27570,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2409
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "劇場"
@@ -27474,10 +27582,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2418
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "図書館"
@@ -27486,10 +27594,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2425
 msgid "Edit Library"
 msgstr "図書館の編集"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "アートセンター"
@@ -27497,10 +27605,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2432
 msgid "Edit Arts Centre"
 msgstr "アートセンターの編集"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "芸術作品"
@@ -27508,10 +27616,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 "礼拝所"
@@ -27521,5 +27629,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 "礼拝所の編集"
@@ -27528,6 +27636,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 "宗教"
@@ -27536,6 +27644,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 "バハーイ教"
@@ -27544,6 +27652,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 "仏教"
@@ -27552,6 +27660,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 "キリスト教"
@@ -27560,6 +27668,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 "ヒンズー教"
@@ -27568,6 +27676,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 "ジャイナ教"
@@ -27576,6 +27684,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 "ユダヤ教"
@@ -27584,6 +27692,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 "ムスリム"
@@ -27592,6 +27700,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 "シーク教"
@@ -27600,6 +27708,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 "降霊術士、イタコ"
@@ -27608,6 +27716,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 "道教"
@@ -27616,6 +27724,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 "ユニテリアン"
@@ -27624,6 +27732,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 "ゾロアスター教"
@@ -27632,6 +27740,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 "宗派"
@@ -27640,6 +27748,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 "英国教会系"
@@ -27648,6 +27756,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 "バプチスト"
@@ -27656,6 +27764,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 "カトリック"
@@ -27664,6 +27772,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 "福音派"
@@ -27672,6 +27780,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 "ものみの塔、エホバの証人"
@@ -27680,6 +27788,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 "ルター派"
@@ -27688,6 +27796,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 "メソジスト派"
@@ -27696,6 +27804,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 "モルモン"
@@ -27704,6 +27812,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 "ギリシャ正教系"
@@ -27712,6 +27820,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 "ペンテコステ派"
@@ -27720,6 +27828,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 "長老派"
@@ -27728,6 +27836,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 "プロテスタント"
@@ -27736,6 +27844,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 "クエーカー教徒"
@@ -27744,6 +27852,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 "シーア派"
@@ -27752,36 +27860,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 "録音スタジオ"
@@ -27789,15 +27897,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 ""
@@ -27805,5 +27913,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 "公共の建物"
@@ -27811,10 +27919,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2469
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "役場"
@@ -27822,5 +27930,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 "役場の編集"
@@ -27829,10 +27937,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 "大使館"
@@ -27840,10 +27948,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2490
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "裁判所"
@@ -27852,10 +27960,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2497
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "刑務所"
@@ -27864,10 +27972,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2504
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "警察"
@@ -27877,10 +27985,10 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2512
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "消防署"
@@ -27889,10 +27997,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2519
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "郵便局"
@@ -27900,25 +28008,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2525
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
 
 #. group "Education"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2531
 msgid "Education"
 msgstr "教育"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2532
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "学校"
@@ -27926,10 +28034,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2539
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "大学"
@@ -27937,10 +28045,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2545
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "短大"
@@ -27948,10 +28056,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2551
 msgid "Edit College"
 msgstr "短大の編集"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr "自動車学校"
@@ -27959,20 +28067,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2557
 msgid "Edit Driving School"
 msgstr "自動車学校の編集"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2562
 msgid "License Classes"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Health"
 msgstr "健康"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "病院"
@@ -27980,10 +28088,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
 #. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2568
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "医院"
@@ -27991,25 +28099,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2574
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2585
 msgid "Nursing Home"
 msgstr ""
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2586
 msgid "Edit Nursing Home"
 msgstr ""
@@ -28017,5 +28125,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "薬局"
@@ -28023,5 +28131,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 "薬局の編集"
@@ -28029,10 +28137,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 "補聴器店"
@@ -28040,5 +28148,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 "補聴器店の編集"
@@ -28046,5 +28154,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -28052,5 +28160,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 "赤ちゃんポストの編集"
@@ -28058,5 +28166,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -28065,5 +28173,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 "夜間急病センターの編集"
@@ -28072,15 +28180,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 "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -28089,5 +28197,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "動物病院"
@@ -28096,10 +28204,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2635
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr "制限"
@@ -28107,15 +28215,15 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2649 build/trans_presets.java:3822
+#: build/trans_presets.java:2650 build/trans_presets.java:3823
 msgid "Note"
 msgstr "備考"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "電話"
@@ -28124,15 +28232,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2660
 msgid "Edit Telephone"
 msgstr "電話を編集"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr "時計"
@@ -28141,5 +28249,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 "時計の編集"
@@ -28149,5 +28257,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 "画面"
@@ -28155,5 +28263,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"
@@ -28162,5 +28270,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"
@@ -28168,5 +28276,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -28174,5 +28282,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -28180,60 +28288,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 "電柱"
+#: 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 "(5mまで)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 20m)"
 msgstr "(20mまで)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(more than 20m)"
 msgstr "(20m以上)"
 
 #. 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 "湿度の表示"
@@ -28241,5 +28344,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "リサイクル"
@@ -28248,5 +28351,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 "リサイクルステーションの編集"
@@ -28254,40 +28357,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "カン"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "紙"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "container"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "centre"
 msgstr ""
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2698
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -28295,5 +28398,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 "ゴミ箱を編集"
@@ -28302,30 +28405,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"
@@ -28333,5 +28436,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -28339,5 +28442,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -28345,5 +28448,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -28351,5 +28454,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -28357,5 +28460,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -28363,5 +28466,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -28369,20 +28472,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"
@@ -28390,5 +28493,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"
@@ -28396,5 +28499,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"
@@ -28402,5 +28505,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"
@@ -28408,10 +28511,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -28420,10 +28523,10 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2721 build/trans_presets.java:4013
+#: build/trans_presets.java:2722 build/trans_presets.java:4014
 msgid "Height"
 msgstr "高さ"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -28431,20 +28534,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr "半分"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr "完全"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr "ロック"
@@ -28452,5 +28555,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -28459,10 +28562,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2731
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -28471,5 +28574,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 "消火栓を編集"
@@ -28477,5 +28580,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"
@@ -28483,5 +28586,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -28489,5 +28592,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -28495,16 +28598,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"
@@ -28512,5 +28615,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"
@@ -28518,5 +28621,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -28524,26 +28627,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 ""
@@ -28551,20 +28649,20 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2752 build/trans_presets.java:3527
+#: build/trans_presets.java:2753 build/trans_presets.java:3528
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2755
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2756
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -28578,6 +28676,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 "スポーツ選択："
@@ -28923,34 +29021,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 "スポーツ"
@@ -28960,6 +29058,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 "多目的"
@@ -28969,6 +29067,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 "アーチェリー"
@@ -28978,6 +29076,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 "アスレチック"
@@ -28987,6 +29085,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 "アメリカンフットボール"
@@ -28996,6 +29094,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 "オーストラリアフットボール"
@@ -29005,6 +29103,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 "野球"
@@ -29014,6 +29112,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 "バスケットボール"
@@ -29023,6 +29121,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 "ペタンク"
@@ -29032,6 +29130,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 "ボーリング"
@@ -29041,6 +29139,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 "カナディアンフットボール"
@@ -29050,6 +29148,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 "カヌー"
@@ -29059,6 +29157,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 "登山"
@@ -29068,6 +29166,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 "クリケット"
@@ -29077,6 +29175,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 "クリケットネット"
@@ -29086,6 +29184,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 "クローク"
@@ -29095,6 +29193,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 "サイクリング"
@@ -29104,6 +29202,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 "ドッグレース"
@@ -29113,6 +29211,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 "乗馬"
@@ -29122,6 +29220,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 "ゲーリックフットボール"
@@ -29131,6 +29229,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 "ゴルフ"
@@ -29140,6 +29238,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 "体操"
@@ -29149,6 +29247,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 "ホッケー"
@@ -29158,6 +29256,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 "競馬"
@@ -29167,6 +29265,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 "モータースポーツ"
@@ -29176,6 +29274,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 "ペロタ"
@@ -29185,6 +29283,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 "ラケットボール"
@@ -29194,6 +29292,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 "ラグビーリーグ"
@@ -29203,6 +29301,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 "(通常の)ラグビー"
@@ -29212,6 +29310,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 "射撃"
@@ -29221,6 +29319,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 "スケートボード"
@@ -29230,6 +29328,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 "スケート"
@@ -29239,6 +29337,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 "スキー"
@@ -29248,6 +29346,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 "サッカー"
@@ -29257,6 +29355,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 "水泳"
@@ -29266,6 +29364,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 "卓球"
@@ -29275,71 +29373,71 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2761 build/trans_presets.java:2770
-#: build/trans_presets.java:2779 build/trans_presets.java:2788
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "tennis"
 msgstr "テニス"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2764
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2765
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2792
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2797
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2798
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
 #. group "Sport"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2804
 msgid "Sport"
 msgstr "スポーツ"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2805
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -29387,25 +29485,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 "タイプ"
@@ -29455,26 +29553,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 "運動場"
@@ -29524,26 +29622,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 "スポーツセンター"
@@ -29588,149 +29686,149 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2808 build/trans_presets.java:2814
-#: build/trans_presets.java:2820 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2850
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2895 build/trans_presets.java:2902
-#: build/trans_presets.java:2910 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2928
-#: build/trans_presets.java:2934 build/trans_presets.java:2940
-#: build/trans_presets.java:2946 build/trans_presets.java:2952
-#: build/trans_presets.java:2958 build/trans_presets.java:2967
-#: build/trans_presets.java:2976 build/trans_presets.java:2982
-#: build/trans_presets.java:2988 build/trans_presets.java:2994
-#: build/trans_presets.java:3000 build/trans_presets.java:3006
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2827
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2857 build/trans_presets.java:2863
+#: build/trans_presets.java:2869 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2887
+#: build/trans_presets.java:2896 build/trans_presets.java:2903
+#: build/trans_presets.java:2911 build/trans_presets.java:2917
+#: build/trans_presets.java:2923 build/trans_presets.java:2929
+#: build/trans_presets.java:2935 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2953
+#: build/trans_presets.java:2959 build/trans_presets.java:2968
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3051
 msgid "stadium"
 msgstr "スタジアム"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2811
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -29738,60 +29836,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2891
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "ダウンヒル"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "ノルディックスキー"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
 msgstr "スノーパーク"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "初心者"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "初球"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
 msgstr "高度"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "expert"
 msgstr "エキスパート"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "freeride"
 msgstr "ただ乗り"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "射撃"
@@ -29799,105 +29897,105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2900
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "American Football"
 msgstr "アメリカンフットボール"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit American Football"
 msgstr "アメリカンフットボールを編集"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2925
 msgid "Canadian Football"
 msgstr "カナディアンフットボール"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Edit Canadian Football"
 msgstr "カナディアンフットボールを編集"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2931
 msgid "Gaelic Football"
 msgstr "ゲーリックフットボール"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Edit Gaelic Football"
 msgstr "ゲーリックフットボールを編集"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2937
 msgid "Rugby League"
 msgstr "ラグビーリーグ"
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2938
 msgid "Edit Rugby League"
 msgstr "ラグビーリーグの編集"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2943
 msgid "Rugby Union"
 msgstr "ラグビー(通常の)"
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2944
 msgid "Edit Rugby Union"
 msgstr "ラグビー(通常の)の編集"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2949
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr "バレーボール"
@@ -29905,10 +30003,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 "ビーチバレー"
@@ -29916,85 +30014,85 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2972
 msgid "Edit Beachvolleyball"
 msgstr "ビーチバレーの編集"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2979
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2980
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr "ゴルフコース"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3021
 msgid "Pelota"
 msgstr "ペロタ"
@@ -30002,35 +30100,35 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3022
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3027
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3028
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3039
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3040
 msgid "Edit Tennis"
 msgstr "テニスの編集"
@@ -30038,40 +30136,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 "安全指導を編集"
@@ -30079,20 +30177,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 "ラジコンカーの編集"
@@ -30100,10 +30198,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 "建物"
@@ -30111,25 +30209,25 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3091
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "communication"
 msgstr "通信用"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "observation"
 msgstr "観察"
@@ -30138,5 +30236,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 "高さ(メートル)"
@@ -30144,5 +30242,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr "旗竿"
@@ -30152,15 +30250,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr "煙突"
@@ -30168,10 +30266,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 "風車"
@@ -30179,20 +30277,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3122
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -30201,5 +30299,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 "パイプラインの編集"
@@ -30243,8 +30341,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
@@ -30254,10 +30352,10 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3136 build/trans_presets.java:3263
+#: build/trans_presets.java:3137 build/trans_presets.java:3264
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr "熱"
@@ -30265,20 +30363,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"
@@ -30286,5 +30384,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"
@@ -30292,5 +30390,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "クレーン"
@@ -30298,10 +30396,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3142
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr "縦坑"
@@ -30310,25 +30408,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 "メートル単位の深さ"
@@ -30336,5 +30434,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 ""
@@ -30342,5 +30440,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 ""
@@ -30348,5 +30446,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 ""
@@ -30355,6 +30453,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 "石炭"
@@ -30362,5 +30460,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 ""
@@ -30368,5 +30466,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 ""
@@ -30374,5 +30472,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 ""
@@ -30380,5 +30478,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 ""
@@ -30386,5 +30484,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 ""
@@ -30392,5 +30490,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 ""
@@ -30398,5 +30496,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 ""
@@ -30404,5 +30502,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 ""
@@ -30410,5 +30508,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 ""
@@ -30416,5 +30514,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 ""
@@ -30422,5 +30520,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 ""
@@ -30428,5 +30526,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 ""
@@ -30434,5 +30532,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 ""
@@ -30440,10 +30538,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 ""
@@ -30451,10 +30549,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 "横坑"
@@ -30462,10 +30560,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 ""
@@ -30473,15 +30571,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3171
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr "水道"
@@ -30489,10 +30587,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 "下水処理場"
@@ -30502,10 +30600,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
 #. item "Man Made/Man Made/Wastewater Plant" label "Edit Wastewater Plant"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3187
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr "水車小屋"
@@ -30513,10 +30611,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 "噴水"
@@ -30525,10 +30623,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3201
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr "井戸"
@@ -30536,5 +30634,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 ""
@@ -30542,5 +30640,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "灯台"
@@ -30548,5 +30646,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 "灯台の編集"
@@ -30554,10 +30652,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 "街灯"
@@ -30565,5 +30663,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 "街灯の編集"
@@ -30572,15 +30670,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 ""
@@ -30588,55 +30686,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"
@@ -30644,5 +30742,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -30650,10 +30748,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 "監視カメラ"
@@ -30661,30 +30759,30 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
 #. item "Man Made/Man Made/Surveillance" label "Edit Surveillance Camera"
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3250
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "indoor"
 msgstr "インドア"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "outdoor"
 msgstr "アウトドア"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "public"
 msgstr "公開"
 
 #. group "Power"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3256
 msgid "Power"
 msgstr "電力関係"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3257
 msgid "Power Generator"
 msgstr "発電所"
@@ -30694,140 +30792,140 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3261
 msgid "Edit Power Generator"
 msgstr "発電所の編集"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biofuel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biogas"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biomass"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "diesel"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "gasoline"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "geothermal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "hydro"
 msgstr "水力発電"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "原子力"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "osmotic"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "solar"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "tidal"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "waste"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wave"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wind"
 msgstr "風"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "Method"
 msgstr "方式"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "anaerobic_digestion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "combustion"
 msgstr "火力発電"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "dam"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fission"
 msgstr "原子力(核分裂)"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fusion"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "gasification"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumped-storage"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumping"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pyrolysis"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "run-of-the-river"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "thermal"
 msgstr ""
@@ -30835,10 +30933,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 ""
@@ -30853,9 +30951,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 ""
@@ -30870,9 +30968,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 ""
@@ -30887,9 +30985,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 ""
@@ -30904,54 +31002,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 "変電所"
@@ -30960,10 +31058,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 "発電サブステーション"
@@ -30972,5 +31070,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 "配電所の編集"
@@ -30978,10 +31076,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 ""
@@ -30990,5 +31088,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 ""
@@ -30996,5 +31094,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "送電塔"
@@ -31005,5 +31103,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 "送電塔の編集"
@@ -31011,10 +31109,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 ""
@@ -31023,5 +31121,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 "電柱の編集"
@@ -31029,10 +31127,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 "送電線"
@@ -31041,15 +31139,15 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3322
+#: build/trans_presets.java:3323
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "line"
@@ -31057,5 +31155,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"
@@ -31063,40 +31161,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3329
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "電力線束のうち良導体の線の数"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "single"
 msgstr "シングル"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "double"
 msgstr "ダブル"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "triple"
 msgstr "３"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3330
 msgid "quad"
 msgstr "４"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3332
+#: build/trans_presets.java:3333
 msgid "Historic Places"
 msgstr "史跡"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "城"
@@ -31105,20 +31203,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3336
+#: build/trans_presets.java:3337
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -31127,10 +31225,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3351
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -31138,10 +31236,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 "化石サイト"
@@ -31149,5 +31247,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 "化石サイトの編集"
@@ -31155,15 +31253,15 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3369
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3370
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -31171,60 +31269,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3375
+#: build/trans_presets.java:3376
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3398
 msgid "Food"
 msgstr "飲食関連"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3399
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -31232,10 +31330,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3407
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "キオスク"
@@ -31243,5 +31341,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 "キオスクの編集"
@@ -31249,5 +31347,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "パン屋"
@@ -31255,10 +31353,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3421
+#: build/trans_presets.java:3422
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "精肉店"
@@ -31266,10 +31364,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3428
+#: build/trans_presets.java:3429
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr "魚屋"
@@ -31277,10 +31375,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 "惣菜屋"
@@ -31288,10 +31386,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 "菓子屋"
@@ -31299,5 +31397,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 "菓子屋の編集"
@@ -31305,5 +31403,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr ""
@@ -31311,10 +31409,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 "八百屋"
@@ -31322,15 +31420,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3470
+#: build/trans_presets.java:3471
 msgid "Edit Greengrocer"
 msgstr "八百屋の編集"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3477
+#: build/trans_presets.java:3478
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
@@ -31338,5 +31436,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr "酒屋"
@@ -31344,25 +31442,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 "ブティック"
@@ -31370,20 +31468,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 "アウトドア店"
@@ -31391,10 +31489,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 "スポーツ店"
@@ -31402,5 +31500,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -31408,10 +31506,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3536
+#: build/trans_presets.java:3537
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "ランドリー"
@@ -31419,20 +31517,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3543
+#: build/trans_presets.java:3544
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3548
+#: build/trans_presets.java:3549
 msgid "Tailor"
 msgstr "仕立て屋"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3550
 msgid "Edit Tailor"
 msgstr "仕立て屋を編集"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3554
+#: build/trans_presets.java:3555
 msgid "Fabric"
 msgstr "手芸用品"
@@ -31440,35 +31538,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 "携帯電話店"
@@ -31476,10 +31574,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 ""
@@ -31487,35 +31585,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 "お金"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "銀行"
@@ -31523,5 +31621,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 "銀行の編集"
@@ -31529,10 +31627,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 "ATM"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "両替"
@@ -31540,5 +31638,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 "両替の編集"
@@ -31546,10 +31644,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 "ATMの編集"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr "百貨店"
@@ -31557,10 +31655,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 ""
@@ -31568,5 +31666,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 ""
@@ -31574,35 +31672,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr "宝石店"
@@ -31610,10 +31708,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 ""
@@ -31621,5 +31719,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 ""
@@ -31627,5 +31725,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "生花店"
@@ -31633,10 +31731,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 "園芸用品店"
@@ -31644,5 +31742,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 "園芸用品店の編集"
@@ -31650,5 +31748,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -31656,10 +31754,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 "DIYショップの編集"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr "金物屋"
@@ -31667,10 +31765,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 "画材店"
@@ -31678,5 +31776,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 "画材店の編集"
@@ -31684,15 +31782,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 ""
@@ -31700,10 +31798,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 "カーテン"
@@ -31711,10 +31809,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 ""
@@ -31722,5 +31820,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 ""
@@ -31728,15 +31826,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 ""
@@ -31744,15 +31842,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 "本屋を編集"
@@ -31760,15 +31858,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr "楽器店"
@@ -31776,20 +31874,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 ""
@@ -31797,10 +31895,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 "自動販売機"
@@ -31808,5 +31906,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 "自動販売機の編集"
@@ -31814,180 +31912,180 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "飲食関連"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "飲料"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "甘味"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "たばこ"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr "写真"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "ペットフード"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "新聞"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "おもちゃ"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "切手"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "車"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "bicycle_tube"
 msgstr "自転車のチューブ"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "condoms"
 msgstr "コンドーム"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "タンポン"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. group "Geography"
-#: build/trans_presets.java:3831 build/trans_presets.java:3955
+#: build/trans_presets.java:3832 build/trans_presets.java:3956
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "境界線"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "国境"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. 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 "Political境界の編集"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:3859
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "地名"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3872
+#: build/trans_presets.java:3873
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -31995,10 +32093,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -32006,25 +32104,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "地方"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr "郡"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr "郡の編集"
@@ -32032,5 +32130,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
@@ -32039,10 +32137,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "町"
@@ -32050,10 +32148,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3910
+#: build/trans_presets.java:3911
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -32061,35 +32159,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3918
+#: build/trans_presets.java:3919
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "村"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3938
+#: build/trans_presets.java:3939
 msgid "Isolated Dwelling"
 msgstr ""
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3939
+#: build/trans_presets.java:3940
 msgid "Edit Isolated Dwelling"
 msgstr ""
@@ -32097,5 +32195,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr "地域"
@@ -32103,10 +32201,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 "山頂"
@@ -32114,10 +32212,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3958
+#: build/trans_presets.java:3959
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "氷河"
@@ -32125,10 +32223,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3966
+#: build/trans_presets.java:3967
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "火山"
@@ -32136,10 +32234,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3974
+#: build/trans_presets.java:3975
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -32147,5 +32245,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 "洞窟の入口の編集"
@@ -32153,5 +32251,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "島"
@@ -32159,10 +32257,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3990
+#: build/trans_presets.java:3991
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr "小島"
@@ -32170,15 +32268,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 "樹木・林"
@@ -32187,15 +32285,15 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:4009
+#: build/trans_presets.java:4010
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "森"
@@ -32204,10 +32302,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:4019
+#: build/trans_presets.java:4020
 msgid "Edit Wood"
 msgstr "森の編集"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -32215,5 +32313,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -32221,5 +32319,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -32227,5 +32325,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "森林"
@@ -32234,30 +32332,30 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:4027
+#: build/trans_presets.java:4028
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "針葉樹"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "広葉樹"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "混合林"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -32265,15 +32363,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr "山(Fell)"
@@ -32281,20 +32379,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 "山(Fell)の編集"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "荒れ地"
@@ -32302,15 +32400,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:4057
+#: build/trans_presets.java:4058
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "土地利用"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -32319,40 +32417,40 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:4066
+#: build/trans_presets.java:4067
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr "温室領域"
@@ -32360,15 +32458,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:4092
 msgid "Edit Greenhouse Horticulture"
 msgstr "温室領域の編集"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4098
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -32376,25 +32474,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr "里山"
@@ -32402,10 +32500,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 "共有地"
@@ -32413,20 +32511,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:4124
+#: build/trans_presets.java:4125
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:4128
+#: build/trans_presets.java:4129
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4130
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -32434,5 +32532,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 "レクレーション広場利用区画の編集"
@@ -32440,15 +32538,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "墓所"
@@ -32456,10 +32554,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:4149
+#: build/trans_presets.java:4150
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -32467,40 +32565,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:4157
+#: build/trans_presets.java:4158
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr ""
@@ -32508,10 +32606,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 "鉄道用地"
@@ -32519,15 +32617,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4192
+#: build/trans_presets.java:4193
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -32535,55 +32633,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr "注釈"
@@ -32591,5 +32689,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
@@ -32600,5 +32698,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 "住所情報の編集"
@@ -32606,5 +32704,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "番地"
@@ -32612,5 +32710,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "家の名前"
@@ -32619,55 +32717,55 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4245 build/trans_presets.java:4399
+#: build/trans_presets.java:4246 build/trans_presets.java:4401
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "都市名"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "国コード"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "AT"
 msgstr "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"
@@ -32675,5 +32773,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
@@ -32685,5 +32783,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 "住所の補間を編集"
@@ -32691,35 +32789,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "奇数"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "偶数"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr "アルファベット順"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4259
 msgid "Contact"
 msgstr "連絡先"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4260
 msgid "Edit Contact information"
 msgstr "連絡先の編集"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4268
+#: build/trans_presets.java:4269
 msgid "Image"
 msgstr "画像"
@@ -32729,5 +32827,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 "マルチポリゴンを編集"
@@ -32739,5 +32837,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 "外側のセグメント"
@@ -32745,5 +32843,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 "内側のセグメント"
@@ -32751,5 +32849,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr "境界"
@@ -32760,5 +32858,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 "境界の編集"
@@ -32766,46 +32864,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 "右左折制限"
@@ -32814,5 +32917,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 "右左折制限の編集"
@@ -32820,40 +32923,40 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "左折禁止"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "右折禁止"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "直進禁止"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
 #. 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 "直進のみ"
@@ -32862,15 +32965,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 "ウェイへ"
@@ -32878,5 +32981,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "ルート"
@@ -32890,5 +32993,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 "ルート編集"
@@ -32898,5 +33001,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 "ルート種類"
@@ -32904,5 +33007,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
@@ -32912,5 +33015,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 "道"
@@ -32918,5 +33021,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 "フェリー"
@@ -32924,5 +33027,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 "スキー"
@@ -32975,9 +33078,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 "徒歩"
@@ -32985,5 +33088,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 "ハイキング"
@@ -32991,5 +33094,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
@@ -32999,5 +33102,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 "迂回路"
@@ -33011,6 +33114,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
@@ -33020,5 +33123,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 "シンボルの説明"
@@ -33030,6 +33133,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 "ネットワーク"
@@ -33037,5 +33140,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 "ルート状態"
@@ -33043,5 +33146,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 "案"
@@ -33049,5 +33152,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 "代替路"
@@ -33055,5 +33158,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 "一時的"
@@ -33061,5 +33164,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 "接続"
@@ -33067,5 +33170,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 "色 (16進法)"
@@ -33077,15 +33180,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 "後方セグメント"
@@ -33093,5 +33196,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 "停止点"
@@ -33099,5 +33202,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 "前方の停止点"
@@ -33105,5 +33208,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 "後方の停止点"
@@ -33111,5 +33214,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -33123,25 +33226,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 ""
@@ -33149,5 +33252,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -33155,5 +33258,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 ""
@@ -33162,5 +33265,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr ""
@@ -33168,5 +33271,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr ""
@@ -33174,10 +33277,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 "住宅"
@@ -33372,6 +33475,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 "破棄された"
@@ -33403,5 +33506,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 "馬"
@@ -33556,10 +33659,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 "バリア"
@@ -33604,5 +33704,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr "車道"
@@ -33646,7 +33746,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 "車線"
@@ -33720,5 +33820,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 "敷地内道路"
@@ -33730,5 +33830,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr "浅瀬（洗い越し）"
@@ -33746,5 +33846,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 ""
@@ -33755,5 +33855,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "転回所"
@@ -33766,5 +33866,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 "緊急アクセスポイント"
@@ -33776,5 +33876,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 "川岸"
@@ -33786,5 +33886,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "小川"
@@ -33796,5 +33896,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "ドック"
@@ -33984,17 +34084,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 "人工物"
@@ -34006,5 +34106,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr "rapids"
@@ -34052,9 +34152,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 "鉄道ポイント"
+
+#. <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"/>
@@ -34071,10 +34189,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 "高架鉄道"
@@ -34102,7 +34220,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 "古い軌道"
@@ -34137,6 +34255,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 "空路"
@@ -34154,5 +34272,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 "空路（暗色）"
@@ -34170,5 +34288,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 "空路（明色）"
@@ -34228,8 +34346,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 "リフト"
@@ -34243,5 +34361,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 "初球者スキーコース"
@@ -34253,5 +34371,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 "中級者スキーコース"
@@ -34263,5 +34381,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 "上級者スキーコース"
@@ -34273,5 +34391,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 "熟練者用のゲレンデ"
@@ -34283,5 +34401,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 "フリースタイルのゲレンデ"
@@ -34293,5 +34411,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 "初心者スキーゲレンデ"
@@ -34420,13 +34538,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 "電力"
@@ -34437,5 +34555,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 "桟橋"
@@ -34447,5 +34565,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "パイプライン"
@@ -34561,13 +34679,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 "レジャー"
@@ -34579,5 +34697,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "マリーナ"
@@ -34651,10 +34769,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 "アメニティ"
@@ -34738,11 +34856,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 "アメニティ_交通"
@@ -35078,24 +35196,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 "アメニティ_信号"
@@ -35121,6 +35239,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 "信号_水域"
@@ -35167,8 +35285,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 "健康"
@@ -35537,34 +35655,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 "店"
@@ -35620,8 +35738,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 "ホテル"
@@ -35697,9 +35815,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 "旅行関係"
@@ -35767,9 +35885,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 "史跡"
@@ -35836,9 +35954,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 "緑"
@@ -35849,5 +35967,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "石切り場"
@@ -35859,5 +35977,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "埋め立て地"
@@ -35875,5 +35993,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 "水たまり、窪地"
@@ -35885,5 +36003,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "森"
@@ -35895,5 +36013,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr "車庫"
@@ -35905,5 +36023,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "農家の庭"
@@ -35922,5 +36040,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 "小売りの商用地"
@@ -35932,5 +36050,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "工業地"
@@ -35942,5 +36060,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -35952,5 +36070,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "緑地"
@@ -35962,5 +36080,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr "鉄道公園"
@@ -36005,7 +36123,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 "軍用地"
@@ -36017,5 +36135,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "共同墓地"
@@ -36026,5 +36144,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "山頂"
@@ -36037,5 +36155,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 "氷河"
@@ -36047,5 +36165,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 "火山"
@@ -36087,8 +36205,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 "自然"
@@ -36100,5 +36218,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "低木"
@@ -36110,5 +36228,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "荒地"
@@ -36120,5 +36238,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr "森林エリア"
@@ -36130,5 +36248,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "泥"
@@ -36140,5 +36258,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "砂浜"
@@ -36198,8 +36316,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 "ルート"
@@ -36278,12 +36396,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 "行政区境"
@@ -36399,11 +36517,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 "場所"
@@ -36415,5 +36533,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_data"
@@ -36449,6 +36567,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"
@@ -36689,9 +36807,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 "ランドサット"
@@ -36699,44 +36816,31 @@
 #. <type>wms</type>
 #. <default>true</default>
-#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&]]></url>
+#. <url><![CDATA[http://irs.gis-lab.info/?layers=landsat&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
+#. <projections>
+#. <code>NASA:4326</code><code>EPSG:32641</code><code>EPSG:3857</code><code>EPSG:3785</code><code>EPSG:32642</code><code>EPSG:32640</code>
+#. <code>EPSG:4326</code><code>EPSG:900913</code><code>EPSG:3395</code><code>EPSG:32639</code><code>EPSG:32638</code><code>EPSG:32637</code>
+#. <code>EPSG:32636</code><code>EPSG:32635</code>
+#. </projections>
 #. </entry>
-#. <!--false;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&-->
-#. <entry>
-#. <name>Open Aerial Map</name>
-#: build/trans_wms.java:12
-msgid "Open Aerial Map"
-msgstr "オープンエアリアルマップ"
-
-#. <type>wms</type>
-#. <url><![CDATA[http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&]]></url>
-#. </entry>
+#.
 #. <!--different forms for web access-->
-#. <!--true;Bing Sat;bing:bing-->
+#.
 #. <entry>
 #. <name>Bing Sat</name>
-#: build/trans_wms.java:19
+#: build/trans_wms.java:18
 msgid "Bing Sat"
 msgstr ""
 
 #. <type>bing</type>
+#. <default>true</default>
 #. <!-- url is used as identifier, so put something here -->
 #. <url>http://www.bing.com/maps/</url>
-#. <default>true</default>
 #. </entry>
-#. <!--false;Yahoo Sat;html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?-->
-#. <entry>
-#. <name>Yahoo Sat</name>
-#: build/trans_wms.java:27
-msgid "Yahoo Sat"
-msgstr "Yahoo 衛星"
-
-#. <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 ""
@@ -36744,11 +36848,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 ""
@@ -36756,73 +36859,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>
@@ -36830,29 +36960,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 "Streets 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>
@@ -36860,13 +37005,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>
@@ -36874,13 +37019,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>
@@ -36888,13 +37033,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>
@@ -36904,273 +37049,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 "チェコ 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 "チェコ 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マップ"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr "7番目のシリーズ (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マップ(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番目のシリーズ (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 "国土交通省 (オルソ)"
-
-#. <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 "国土交通省 (オルソ01)"
-
-#. <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 "国土交通省 (オルソ02)"
-
-#. <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 "国土交通省 (オルソ03)"
-
-#. <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 "PCN 2006 - イタリア"
 
 #. <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>
@@ -37178,35 +38146,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 ""
@@ -37218,9 +38202,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 ""
@@ -39673,4 +40658,21 @@
 msgstr "GPX"
 
+#: ../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
@@ -40256,18 +41258,18 @@
 msgstr "m"
 
-#: ../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 "インポート中..."
@@ -40943,16 +41945,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 ""
@@ -41006,80 +42007,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
@@ -41087,35 +42122,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
@@ -41123,8 +42172,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
@@ -41134,11 +42191,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 ""
 
@@ -42538,4 +43626,13 @@
 msgid "Revert changeset #{0}"
 msgstr "変更セット # {0} を元に戻す"
+
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
+msgid "Found XML element <nd> not as direct child of element <way>."
+msgstr "<way> 要素を直接引き継いでない XML 要素の <nd> が見つかった。"
+
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
+msgid "Found XML element <member> not as direct child of element <relation>."
+msgstr ""
+"要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:29
@@ -42712,4 +43809,24 @@
 msgstr "エリアから不要なノードを削除。"
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "はい、ノードを削除"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "ダウンロード済みデータ領域の外側のノードを削除"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "いいえ、異常終了します"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "強制削除しますか？"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "データ領域外のノードを削除しますか？"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42771,9 +43888,4 @@
 msgid "Error while exporting {0}: {1}"
 msgstr "{0}:{1}をエキスポートの際にエラー"
-
-#: ../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 "ウェイ： "
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -43459,9 +44571,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 ""
@@ -43562,17 +44674,17 @@
 "''{1}'' 内で削除済みまたは非表示です"
 
-#: ../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 "選択されたリレーションメンバーを上へひと目盛り移動"
@@ -44303,4 +45415,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
@@ -44322,27 +45450,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 "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
-#, fuzzy
-msgid "Configure custom URL"
-msgstr "サイトを構成..."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
@@ -44400,6 +45513,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 ""
 
@@ -44517,5 +45660,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 ""
@@ -44529,5 +45672,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 ""
@@ -44542,12 +45685,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 ""
 
@@ -44891,2 +46048,93 @@
 msgid "Drive a race car on this layer"
 msgstr ""
+
+#~ msgid "Overlapping areas"
+#~ msgstr "重なった領域"
+
+#~ msgid "NPE Maps"
+#~ msgstr "NPEマップ"
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "NPEマップ(Tim)"
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "オープンエアリアルマップ"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr ""
+#~ "OSM ノード、ウェイまたはリレーションについてのオブジェクト情報を表示"
+
+#~ msgid "Info about Element"
+#~ msgstr "要素についての情報"
+
+#~ msgid "Invalid URL?"
+#~ msgstr "不正なURL？"
+
+#~ msgid "Yes, fetch images"
+#~ msgstr "はい、画像を取得します"
+
+#~ msgid ""
+#~ "Warning: Fetching WMS tiles is likely to fail. Please check you "
+#~ "preference settings."
+#~ msgstr ""
+#~ "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。"
+
+#~ msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+#~ msgstr ""
+#~ "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
+
+#~ msgid "(deactivated)"
+#~ msgstr "(無効化)"
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Yahoo Sat"
+#~ msgstr "Yahoo 衛星"
+
+#~ msgid ""
+#~ "The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+#~ "This may lead to wrong coordinates."
+#~ msgstr ""
+#~ "URL中の投影法 ''{0}'' は現在の投影法 ''{1}'' と一致しません。\n"
+#~ "間違った座標にたどりつく可能性があります。"
+
+#~ msgid "Object history"
+#~ msgstr "オブジェクト履歴"
+
+#~ msgid "Near"
+#~ msgstr "近く"
+
+#~ msgid "MLIT Japan (ORTHO)"
+#~ msgstr "国土交通省 (オルソ)"
+
+#~ msgid "MLIT Japan (ORTHO01)"
+#~ msgstr "国土交通省 (オルソ01)"
+
+#~ msgid "MLIT Japan (ORTHO02)"
+#~ msgstr "国土交通省 (オルソ02)"
+
+#~ msgid "MLIT Japan (ORTHO03)"
+#~ msgstr "国土交通省 (オルソ03)"
+
+#~ msgctxt "placeselection"
+#~ msgid "Zoom"
+#~ msgstr "拡大"
+
+#~ msgid "Save Access Token to preferences"
+#~ msgstr "アクセストークンをプリファレンスに保存"
+
+#~ 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}は、対応するファイル取り込みフィルターがないため開けません。"
+
+#~ msgid "Get detailed information on the internal state of the objects."
+#~ msgstr "オブジェクトに内部状態に関して詳細な情報を取得。"
+
+#~ msgid "Inspect"
+#~ msgstr "検査"
+
+#~ msgid "Warning: The complete URL is ''{0}''."
+#~ msgstr "警告: 完全なURL は ''{0}'' です。"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 26723)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 26724)
@@ -4,27 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
-#. <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:53+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:15+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-27 14:54+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"
@@ -166,14 +149,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
@@ -184,7 +167,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
@@ -200,6 +183,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
@@ -209,5 +192,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
@@ -387,8 +370,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
@@ -402,6 +385,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
@@ -413,6 +396,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
@@ -427,6 +410,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
@@ -448,7 +431,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
@@ -465,5 +450,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 "Avbryt"
@@ -474,4 +459,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 "Velg minst én allerede opplastet node, linje eller relasjon."
@@ -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 "data"
@@ -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 "Steng åpent endringsset"
@@ -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 "Velg noe å kopiere."
 
-#: ../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 ""
@@ -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 "Skriv over"
 
 #: ../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 "Filen finnes. Vil du overskrive filen?"
@@ -1138,5 +1128,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}"
@@ -1210,12 +1200,26 @@
 msgstr "Eksporter GPX fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Objekthistorie"
-
-#: ../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 "Historikk"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Vis historikk for OSMs noder, linjer eller relasjoner."
+
+#: ../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
@@ -1260,5 +1264,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"
@@ -1285,12 +1289,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 "Informasjon om element"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
+#: ../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
@@ -1310,6 +1326,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."
@@ -1319,21 +1338,24 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
 msgid "This can lead to nodes being deleted accidentally."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:341
 msgid "Are you really sure to continue?"
 msgstr "Vil du virkelig fortsette?"
 
-#: ../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 "Angre hvis du er usikker"
 
-#: ../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 "Fant ingen skjæring. Ingen endringer ble gjort."
@@ -1341,33 +1363,33 @@
 #. revert changes
 #. FIXME: this is dirty hack
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:383
 msgid "Reverting changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:451
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:444
 msgid "Added node on all intersections"
 msgstr "Noder er lagt til i alle skjæringspunkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:516
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:509
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Slett linjer som ikke er del av en indre multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
 msgstr "Slo sammen overlappende områder"
 
-#: ../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 "
@@ -1377,23 +1399,23 @@
 "oppstått."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "Reparer konflikter i egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1234
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1244
 msgid ""
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1249
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1263
 msgid ""
 "Sorry. Cannot handle way that is both inner and outer in multipolygon "
@@ -1401,19 +1423,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 "Fjernede Element fra Relasjoner"
 
 #. 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 "Fjern egenskaper fra indre linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -1618,4 +1640,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
@@ -1635,8 +1658,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 "opp"
@@ -1656,4 +1680,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
@@ -1673,8 +1698,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 "ned"
@@ -1755,20 +1781,31 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156
 #, java-format
-msgid "Cannot open {0} file because no suitable file importer is available."
+msgid ""
+"Cannot open {0} file because file does not exist or no suitable file "
+"importer is available."
 msgid_plural ""
-"Cannot open {0} files because no suitable file importer is available."
+"Cannot open {0} files because files do not exist or no suitable file "
+"importer is available."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167
+msgid "no importer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167
+msgid "does not exist"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:213
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1777,5 +1814,5 @@
 msgstr[1] "Åpner {0} filer..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1895,7 +1932,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
@@ -2060,5 +2097,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 "Lagre"
@@ -2074,30 +2111,30 @@
 msgstr "Filen {0} finnes allerede. Vil du skrive over den?"
 
-#: ../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 "Ingen Exporter funnet! Ingenting lagret."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "Lagre uansett"
 
-#: ../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 "Dokumentet er tomt."
 
 #. 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 "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "Avvis konflikter og lagre"
 
-#: ../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 "
@@ -2107,13 +2144,13 @@
 "du fortsette?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "Lagre OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "Lagre GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "Lagre lag"
@@ -2165,5 +2202,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
@@ -2173,55 +2210,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 "Lukk"
 
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Forenkle linje"
 
-#: ../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 "Slett overflødige noder fra en linje."
 
-#: ../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 "Ja, slett noder"
-
-#: ../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 "Slette noder utenfor nedlastede data-områder"
-
-#: ../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 "Nei, avbryt"
-
-#: ../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 "Avbryt operasjon"
-
-#: ../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 "Vil du slette dem uansett?"
-
-#: ../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 "Slette node utenfor data-områder?"
-
-#: ../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 "Velg minst én linje å forenkle."
 
-#: ../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
@@ -2232,10 +2236,16 @@
 msgstr "Ja"
 
-#: ../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 "Forenkle alle valgte linjer"
 
-#: ../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 "Avbryt operasjon"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2244,10 +2254,10 @@
 msgstr "Utvalget inneholder {0} linjer. Vil du virkelig forenkle disse?"
 
-#: ../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 "Forenkle linjer?"
 
-#: ../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
@@ -2257,5 +2267,5 @@
 msgstr[1] "Forenkle {0} linjer"
 
-#: ../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)"
@@ -2317,5 +2327,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 "
@@ -2324,5 +2334,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 "
@@ -2358,37 +2368,37 @@
 msgstr "Dupliser noder som er med i flere linjer."
 
-#: ../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 "Denne noden har ikke knytninger"
 
-#: ../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 "Ingen av disse nodene har knytninger."
 
-#: ../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 "Ingen noder i denne linjen har andre knytninger."
 
-#: ../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 "Valgte element har ikke knytninger som kan løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
 msgstr "Velg:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* En node med egenskaper, eller"
 
-#: ../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 "– En node som brukes av flere linjer, eller"
 
-#: ../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 "– En node som er brukt av flere linjer, og en av linjene, eller"
 
-#: ../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"
@@ -2396,10 +2406,10 @@
 "– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
 
-#: ../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 "– En linje, og en eller flere av nodene som er brukt i flere linjer."
 
-#: ../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"
@@ -2412,14 +2422,14 @@
 "kopier og alle noder bli valgt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
 msgstr "Node uten tilknytning"
 
-#: ../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 "Kopier til {0} noder"
 
-#: ../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"
@@ -2427,4 +2437,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
@@ -2520,14 +2547,14 @@
 msgstr "Utvalget er tomt"
 
-#: ../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 "Last opp 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 ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2536,5 +2563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:114
@@ -2542,5 +2569,5 @@
 msgstr "Ingen endringer å laste opp."
 
-#: ../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 "Ingen endringer å laste opp. Finn frem data først."
@@ -3012,8 +3039,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
@@ -3386,5 +3413,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 "Søk"
@@ -3610,5 +3637,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 "Annet"
@@ -3757,25 +3784,25 @@
 msgstr "kan ikke løse uavgjort konflikt"
 
-#: ../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 "Slett linje {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 ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
 #, java-format
 msgid "Delete {0} object"
@@ -3784,5 +3811,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"
@@ -3791,5 +3818,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"
@@ -3798,5 +3825,5 @@
 msgstr[1] "Slett {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -3805,13 +3832,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."
@@ -3823,14 +3852,5 @@
 "nå) .<br>Er du sikker på at du vil slette nodene?"
 
-#: ../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 "
@@ -4046,4 +4066,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}''"
@@ -4051,19 +4072,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 "Innstillingsfil har feil i linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4072,5 +4094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4079,5 +4101,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4086,5 +4108,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4093,5 +4115,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
@@ -4099,5 +4121,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4106,5 +4128,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4113,5 +4135,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4120,5 +4142,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4127,5 +4149,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}"
@@ -4199,20 +4221,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 "S"
 
-#: ../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 "N"
 
-#: ../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 "V"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4229,5 +4251,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}."
@@ -4235,5 +4257,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}."
@@ -4251,5 +4273,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 ""
@@ -4257,5 +4279,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 ""
@@ -4324,5 +4346,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 "
@@ -4330,5 +4352,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 ""
@@ -4339,5 +4361,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"
@@ -4360,6 +4382,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"
@@ -4702,5 +4724,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 +4751,9 @@
 #, java-format
 msgid "Running test {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:26
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:78
+msgid "Building inside building"
 msgstr ""
 
@@ -4781,71 +4808,98 @@
 msgstr "Kryssende linjer"
 
-#: ../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 "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
 
-#: ../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 "Dobbelt-Noder"
 
-#: ../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 ""
@@ -4908,54 +4962,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 "Multipolygon"
 
-#: ../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 "Ingen ytre linje i multipolygon"
 
-#: ../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 ""
@@ -4989,4 +5043,9 @@
 msgstr "Denne testen finner Noder som har samme navn (kan være dubletter)"
 
+#: ../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."
@@ -5001,29 +5060,25 @@
 "enn én linje."
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103
-msgid "Overlapping areas"
-msgstr "Overlappende områder"
-
-#: ../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 "Overlappende ferdselsveier (med område)"
 
-#: ../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 "Overlappende jernbaner (med område)"
 
-#: ../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 "Overlappende linjer (med område)"
 
-#: ../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 "Overlappende ferdselsveier"
 
-#: ../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 "Overlappende jernbaner"
 
-#: ../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 "Overlappende linjer"
@@ -5226,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
@@ -5247,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
@@ -5273,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."
@@ -5433,48 +5488,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 "Ikke lukkede linjer."
 
-#: ../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 "Kontrollerer om sirkulære linjer er lukket."
 
-#: ../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 "natur-type {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 "Type Bruk av Grunn {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 "fasilitetstype {0}"
 
-#: ../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 "sport type {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:88
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:86
 #, java-format
 msgid "tourism type {0}"
 msgstr "turisme type {0}"
 
-#: ../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 "butikk type {0}"
 
-#: ../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 "fritids type {0}"
 
-#: ../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}"
@@ -5522,7 +5577,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"
@@ -5534,10 +5589,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 "område"
 
-#: ../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 "Ikke lukket linje"
@@ -5666,7 +5721,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}]"
@@ -5702,14 +5757,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:287
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:303
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
 msgid "incomplete"
 msgstr "uferdig"
 
 #. 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}"
@@ -5718,6 +5774,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}"
@@ -5725,12 +5781,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 "ferdselsvei"
@@ -5738,17 +5794,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 "jernbane"
 
-#: ../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 "vannvei"
 
-#: ../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 "bruk av grunn"
@@ -5757,8 +5813,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
@@ -5769,6 +5825,6 @@
 msgstr[1] "{0} noder"
 
-#: ../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"
@@ -5777,9 +5833,9 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:494
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5885,5 +5941,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 ""
@@ -6119,5 +6175,5 @@
 msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
 
-#: ../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"
@@ -6125,10 +6181,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 "Vis"
 
-#: ../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
@@ -6137,5 +6193,5 @@
 msgstr "Verktøy"
 
-#: ../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
@@ -6143,5 +6199,5 @@
 msgstr "Objektmaler"
 
-#: ../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
@@ -6152,5 +6208,5 @@
 msgstr "Meny: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Audio"
@@ -6187,5 +6243,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"
@@ -6193,5 +6249,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"
@@ -6343,5 +6399,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
@@ -6524,5 +6580,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
@@ -6532,5 +6588,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"
@@ -6540,5 +6596,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 "Medlemmer"
@@ -6782,5 +6838,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
@@ -6914,4 +6970,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 "slettet"
@@ -6981,6 +7038,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
@@ -7002,6 +7059,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
@@ -7111,5 +7168,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"
@@ -7192,5 +7249,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
@@ -7202,5 +7259,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
@@ -7332,9 +7389,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:164
 msgid "For selected objects only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:165
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7343,18 +7400,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:243
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:245
 msgid "Open the list of changesets in the current layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:290
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:339
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
@@ -7362,23 +7419,23 @@
 msgstr "Last ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:340
 msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:375
 msgid "Closes the selected open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:406
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
 msgid "Show info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:407
 msgid "Open a web page for each selected changeset"
 msgstr ""
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:446
 #: build/specialmessages.java:49
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
@@ -7386,5 +7443,5 @@
 msgstr "Detaljer"
 
-#: ../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 ""
@@ -7403,12 +7460,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
@@ -7455,5 +7512,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
@@ -7629,19 +7686,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 "Historikk"
-
-#: ../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 "Vis historikk på alle valgte objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:242
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:260
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
@@ -7651,10 +7702,10 @@
 msgstr "Last inn på nytt"
 
-#: ../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 "Les inn og oppfrisk liste over alle valgte objekt."
 
 #. 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
@@ -7666,149 +7717,140 @@
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Display the history of the selected objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66
 msgid "Advanced object info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77
 msgid "map style"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-msgid "In conflict with:\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
-#, java-format
-msgid "Node id={0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
+#, java-format
+msgid " ({0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:144
+msgid "not in data set"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:191
-msgid " not in data set"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152
+msgid "Node: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:171
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr "Linje: "
+
 #: ../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 ""
@@ -7818,5 +7860,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 ""
@@ -7825,5 +7867,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 ""
@@ -7833,5 +7875,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -7840,22 +7882,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 ""
@@ -7873,5 +7915,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
@@ -7883,10 +7925,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
@@ -7963,5 +8005,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 "Vis/Skjul"
@@ -7980,5 +8022,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 ""
@@ -8012,9 +8054,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 "Flytt laget en rad opp."
 
-#: ../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 "Flytt laget en rad ned."
@@ -8087,5 +8129,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"
@@ -8128,24 +8170,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 "Relasjoner"
 
-#: ../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 "Åpne en liste over alle relasjoner"
 
-#: ../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 "Åpne en editor for den valgte relasjon"
 
-#: ../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 "Slet valgt relasjon"
 
-#: ../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
@@ -8154,5 +8196,5 @@
 msgstr "Oprett ny relasjon"
 
-#: ../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
@@ -8160,133 +8202,125 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
 msgid "Add the selected relations to the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Select relation (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1232
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
 msgid "Add the members of all selected relations to current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:468
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
 msgid "Select members (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1263
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:818
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:537
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:817
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1282
 msgid "Download incomplete members of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:538
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1284
 msgid "Download incomplete members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:773
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relasjoner: {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 "Aktuelt utvalg"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "Åpne vindu med en utvalgsliste"
-
-#: ../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 "Zoom til utvalg"
-
-#: ../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 "Zoom til valgt(e) element"
-
-#: ../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 "Utvalg"
 
-#: ../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 "Åpne vindu med en utvalgsliste"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
+msgid "Current Selection"
+msgstr "Aktuelt utvalg"
+
+#: ../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 "Zoom til utvalg"
+
+#: ../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 "Zoom til valgt(e) element"
+
+#: ../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 "Valgt: Rel.:{0} / Linjer:{1} / Noder:{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 "Utvalg: {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
@@ -8369,6 +8403,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 ""
 
@@ -8376,4 +8409,8 @@
 msgid "Open the validation window."
 msgstr "Åpne valideringsvindu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
+msgid "Validation results"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -8720,4 +8757,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" />
@@ -8773,8 +8815,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" />
@@ -9559,5 +9597,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
@@ -9568,179 +9606,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
@@ -10159,9 +10198,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 "Tilføy egenskaper"
 
-#: ../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."
@@ -10170,14 +10209,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:636
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:710
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:646
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:720
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:164
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:309
@@ -10189,5 +10228,5 @@
 msgstr "<different>"
 
-#: ../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?"
@@ -10195,13 +10234,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 ""
@@ -10210,5 +10249,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
@@ -10218,5 +10257,5 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../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."
@@ -10225,31 +10264,31 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../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 "Velg en nøkkel"
 
-#: ../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 "Velg en verdi"
 
-#: ../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 "Velg de objekter, du vil rette egenskaper for."
 
-#: ../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 "Egenskaper/medlemsskaper"
 
-#: ../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 "Egenskaper for valgte objekt."
 
 #. 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"
@@ -10258,63 +10297,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 "Egenskaper: {0} / Medlemskap: {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 "Egenskaper / Medlemskap"
 
-#: ../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 "Skift relasjon"
 
-#: ../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 "Slett fra relasjon"
 
-#: ../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 "Vil du slette utvalget fra relasjon {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 "Fjern den valgte nøkkel i alle objekt"
 
-#: ../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 "DSlett egenskaper"
 
-#: ../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 "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../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 "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../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 ""
 
@@ -10800,57 +10863,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. breddegrad"
 
-#: ../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. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../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 "
@@ -10860,10 +10923,10 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
 
-#: ../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
@@ -10872,15 +10935,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"
@@ -10957,13 +11020,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 ""
 
@@ -11012,7 +11066,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"
@@ -11028,12 +11087,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
@@ -11116,4 +11176,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"
@@ -11151,5 +11213,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 ""
@@ -11174,10 +11236,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 "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
 
-#: ../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 ""
@@ -11185,5 +11247,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 ""
@@ -11193,9 +11255,9 @@
 "historikken."
 
-#: ../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 "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:318
 #, java-format
 msgid ""
@@ -11279,13 +11341,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}"
@@ -11860,5 +11922,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
@@ -11870,11 +11932,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 "Lag"
@@ -11894,5 +11956,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 ""
@@ -11915,5 +11977,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
@@ -11926,5 +11988,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 ""
@@ -11943,30 +12005,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 "Last opp endringer"
 
-#: ../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 "
@@ -11977,33 +12039,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}"
@@ -12355,5 +12417,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
@@ -12718,5 +12780,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 ""
@@ -12726,65 +12788,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 "Last Kartbilde"
 
-#: ../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 "Hent alle kartbilder"
 
-#: ../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 "Zoom inn"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:436
 msgid "Decrease zoom"
 msgstr "Zoom ut"
 
-#: ../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 "Tøm bildehurtiglager"
 
-#: ../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 ""
@@ -12799,103 +12861,77 @@
 msgstr "Ingen valideringsfeil"
 
-#: ../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 "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../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 "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../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 "Last ned synlige kartbilder"
 
-#: ../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 "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../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 "Last ned kartbilder med feil på nytt"
 
-#: ../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 channel"
 
-#: ../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 "Lagre WMS lag til fil"
 
-#: ../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 "Lagre WMS-lag"
 
-#: ../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 "les inn WMS lag fra fil"
 
-#: ../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 "Last inn WMS-lag"
 
-#: ../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 "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../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 "Feil Fil Format"
 
-#: ../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 "Feil ved lasting av fil"
 
-#: ../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 "Automatisk nedlasting"
 
-#: ../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}"
@@ -13271,5 +13307,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"
@@ -13472,4 +13511,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 ""
@@ -13615,4 +13655,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"
@@ -13690,8 +13732,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 ""
 
@@ -14043,26 +14081,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 "Meny Navn"
 
-#: ../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"
@@ -14070,49 +14108,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 ""
@@ -14334,5 +14371,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}"
@@ -14468,5 +14505,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
@@ -14534,5 +14571,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 "Bil"
@@ -14558,14 +14595,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 "Sykkel"
@@ -14604,13 +14641,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 "Til fots"
@@ -14763,113 +14800,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 "Nedlaster:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180
 msgid "Overlap tiles"
 msgstr "Overlapp kartbilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181
 msgid "% of east:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
 msgid "% of north:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197
 msgid "Simultaneous connections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:213
 msgid "Auto zoom by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:202
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:217
 msgid "Autoload tiles by default: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:221
 msgid "Min. zoom level: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:210
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:225
 msgid "Max. zoom level: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:229
 msgid "Add to slippymap chooser: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:233
 msgid "Tile cache directory: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255
 msgid "Common Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256
 msgid "WMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257
 msgid "TMS Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Imagery Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Modify list of imagery layers displayed in the Imagery menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274
 msgid "Imagery providers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276
 msgid "Offset bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:406
+msgid "Imagery Background: Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470
 msgid "Available default entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:428
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:504
 msgid "Selected entries:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:598
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
@@ -14880,55 +14921,55 @@
 msgstr "Ny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:447
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:599
 msgid "Add a new WMS/TMS entry by entering the URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:455
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:607
 msgid "Add Imagery URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:619
 msgid "Remove entry"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:493
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:645
 msgid "copy selected defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:664
 msgid "Please select at least one row to copy."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:549
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:707
 msgid "reload defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785
 msgid "Menu Name (Default)"
 msgstr "Meny Navn (Standard)"
 
-#: ../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 ""
@@ -15506,7 +15547,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 "Reset"
@@ -16056,5 +16099,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 ""
@@ -16063,5 +16106,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 ""
@@ -16101,28 +16144,28 @@
 msgstr "Valgfrie attributter:"
 
-#: ../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 "Bruk objektmal «{0}» i gruppe «{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 "Bruk objektmal «{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 "Ukjent type: {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
@@ -16132,15 +16175,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {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 "Feil ved lesing av {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 "Element type {0} kan brukes."
 
-#: ../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
@@ -16150,22 +16193,22 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../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 "Bruk Objektmal"
 
-#: ../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"
@@ -16227,4 +16270,40 @@
 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 ""
+"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
+
+#: ../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 "Slettet node {0} er del av linje {1}"
+
+#: ../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 ""
 
@@ -16812,5 +16891,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
@@ -16935,5 +17014,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
@@ -16944,5 +17022,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
@@ -16970,4 +17048,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
@@ -17013,14 +17092,14 @@
 msgstr "Fila «{0}» finnes ikke"
 
-#: ../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
@@ -17030,10 +17109,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 "Slettet linje {0} inneholder noder"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
@@ -17042,5 +17122,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
@@ -17050,16 +17130,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 "Slettet linje {0} inneholder noder"
-
-#: ../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
@@ -17067,5 +17142,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
@@ -17073,5 +17148,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
@@ -17080,5 +17155,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
@@ -17088,21 +17163,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 "Ufullstendig <member>-spesifikasjon med 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
@@ -17111,5 +17180,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
@@ -17117,6 +17186,6 @@
 msgstr "Ulovlig objekt med 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
@@ -17129,8 +17198,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
@@ -17144,5 +17213,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
@@ -17150,5 +17219,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
@@ -17157,6 +17226,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
@@ -17170,6 +17239,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
@@ -17180,5 +17249,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
@@ -17187,5 +17256,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
@@ -17194,53 +17263,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 ""
-"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
-
-#: ../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 "Slettet node {0} er del av linje {1}"
-
-#: ../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 "Klargjør OSM-data …"
 
-#: ../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
@@ -17397,4 +17432,33 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "OSM-tjenerfiler gzip-komprimert"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "Ugyldig dato"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "Ugyldig stavekontroll linje: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, fuzzy, java-format
+msgid "Invalid timestamp: {0}"
+msgstr "Ugyldig tidssone"
+
+#: ../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 "Laster ned OSM-data …"
+
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
@@ -17414,11 +17478,4 @@
 msgstr "Lagre bruker og passord (ukryptert)"
 
-#: ../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
@@ -17435,31 +17492,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 ""
-
-#: ../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 ""
-"Kartprojeksjonen «{0}» i URL og valgt kartprojeksjon «{1}» passer ikke.\n"
-"Dette resulterer i feil koordinater."
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -18203,10 +18233,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 "Fant ikke oversettelsen for {0}. Bruker {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
@@ -18216,5 +18246,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
@@ -18223,6 +18253,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 ""
@@ -18257,5 +18287,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18268,5 +18298,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"
@@ -18276,5 +18306,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18285,5 +18315,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 "(Hint: Du kan endre hurtigtastene i Innstillinger.)"
@@ -18925,16 +18955,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 "
@@ -18947,15 +18982,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 "
@@ -18965,5 +19000,5 @@
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
@@ -18972,10 +19007,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 "
@@ -18984,10 +19019,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
 msgstr "For vektorisering av  WMS bilder."
 
 #. 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 "
@@ -18996,5 +19031,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."
@@ -19004,5 +19039,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 "
@@ -19012,5 +19047,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 "
@@ -19023,25 +19058,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. "
@@ -19050,5 +19085,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 "
@@ -19061,15 +19096,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 "Importerer tema fra OpenStreetBugs"
 
 #. 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"
@@ -19077,5 +19112,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."
@@ -19083,10 +19118,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 "
@@ -19095,5 +19130,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 "
@@ -19104,15 +19139,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 Look and Feel."
 
 #. 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."
@@ -19120,25 +19155,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 "
@@ -19148,5 +19183,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 "
@@ -19157,10 +19192,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. 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 "
@@ -19170,20 +19205,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 "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. 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 "
@@ -19196,15 +19231,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. 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). "
@@ -19213,5 +19248,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) "
@@ -19220,10 +19255,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."
@@ -19231,5 +19266,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19238,15 +19273,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 "
@@ -19256,5 +19291,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19263,20 +19298,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. 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 "
@@ -19441,9 +19476,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 "Veinummer"
@@ -19496,6 +19531,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 "Fartsgrense (km/t)"
@@ -19544,9 +19579,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 "Enveiskjøring"
@@ -19596,9 +19631,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 "Bro"
@@ -19639,9 +19674,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"
@@ -19680,9 +19715,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 "Skjæring"
@@ -19721,9 +19756,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 "Øy"
@@ -19762,9 +19797,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 ""
@@ -19850,4 +19885,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"
@@ -19865,8 +19901,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 "Stigning"
@@ -19886,4 +19923,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
@@ -19901,8 +19939,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 ""
@@ -19922,4 +19961,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
@@ -19937,8 +19977,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 ""
@@ -19958,4 +19999,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
@@ -19973,8 +20015,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 ""
@@ -19994,4 +20037,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
@@ -20009,8 +20053,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 ""
@@ -20083,5 +20128,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 "Passeringspunkter"
@@ -20113,10 +20158,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 "Bredde ( meter)"
@@ -20158,9 +20203,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 "Veidekke"
@@ -20185,9 +20230,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 "fast dekke"
@@ -20211,9 +20256,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 "uten fast dekke"
@@ -20237,9 +20282,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 ""
@@ -20264,9 +20309,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 "betong"
@@ -20291,9 +20336,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 ""
@@ -20313,4 +20358,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
@@ -20319,10 +20365,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 "skogsområde"
@@ -20346,9 +20392,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 ""
@@ -20373,9 +20419,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 "brostein"
@@ -20400,9 +20446,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 "grus"
@@ -20426,9 +20472,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 ""
@@ -20452,9 +20498,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 ""
@@ -20478,9 +20524,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 ""
@@ -20505,9 +20551,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 "gress"
@@ -20532,9 +20578,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 "sand"
@@ -20560,10 +20606,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 "jord"
@@ -20714,5 +20760,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 "rundkjøring"
@@ -20866,64 +20912,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
@@ -20999,8 +21045,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"
@@ -21030,8 +21076,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 "leveranse"
@@ -21081,9 +21127,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"
@@ -21126,9 +21172,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"
@@ -21149,7 +21195,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 "Skog- og Landbruk"
@@ -21169,7 +21215,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 ""
@@ -21309,61 +21355,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
@@ -21397,10 +21443,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 ""
@@ -21432,10 +21478,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 "brukertype"
@@ -21454,11 +21500,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 "Hest"
@@ -21476,5 +21522,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 ""
@@ -21495,12 +21541,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 "Motorsykkel"
@@ -21518,10 +21564,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 "Motorkjøretøy"
@@ -21621,6 +21667,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 "motorway"
@@ -21628,5 +21674,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 "motorway_link"
@@ -21646,6 +21692,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 "trunk"
@@ -21653,5 +21699,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 "trunk_link"
@@ -21671,6 +21717,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 "riksvei"
@@ -21678,5 +21724,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 "tilkjørselsvei_riksvei"
@@ -21696,6 +21742,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 "fylkesvei"
@@ -21715,6 +21761,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 "kommunevei"
@@ -21722,5 +21768,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 "småvei"
@@ -21734,6 +21780,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 "boligvei"
@@ -21741,5 +21787,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 "gatetun"
@@ -21780,6 +21826,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 "adkomstvei"
@@ -21787,5 +21833,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 "trikkespor"
@@ -21810,7 +21856,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 "veiarbeid"
@@ -21846,11 +21892,22 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "Vadested"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "Rediger vadested"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "Mindre veier"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
 msgstr "Traktorvei"
@@ -21859,35 +21916,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 "Rediger traktorvei"
 
 #. 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 ""
@@ -21895,10 +21952,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 ""
@@ -21906,5 +21963,5 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr "Sti"
@@ -21913,50 +21970,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 "Rediger sti"
 
 #. 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, "
@@ -21965,5 +22022,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 "
@@ -21973,5 +22030,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 "
@@ -21980,5 +22037,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, "
@@ -21987,5 +22044,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, "
@@ -21995,5 +22052,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"
@@ -22001,10 +22058,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 ""
@@ -22012,15 +22069,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 "middels"
 
 #. 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 ""
@@ -22043,23 +22100,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 "Ski"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr "Snøscooter"
@@ -22068,5 +22125,5 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
 msgstr "Dedikert ridevei"
@@ -22074,5 +22131,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 "Rediger ridevei"
@@ -22080,5 +22137,5 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
 msgstr ""
@@ -22086,10 +22143,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 ""
@@ -22098,6 +22155,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 ""
@@ -22148,27 +22205,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 ""
@@ -22177,6 +22234,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 ""
@@ -22185,6 +22242,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 ""
@@ -22193,6 +22250,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 ""
@@ -22201,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 "share_busway"
 msgstr ""
@@ -22209,21 +22266,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 ""
@@ -22231,15 +22288,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 "Dedikert sykkelvei"
@@ -22257,11 +22314,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 "Rediger sykkelvei"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr ""
@@ -22269,5 +22326,5 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
 msgstr "Adskilt gang- og sykkelvei"
@@ -22275,5 +22332,5 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinert gang- og sykkelvei"
@@ -22281,5 +22338,5 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
 msgstr "Dedikert gangvei"
@@ -22288,5 +22345,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 "Rediger gangvei"
@@ -22294,5 +22351,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "Trapper"
@@ -22302,10 +22359,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 "Rediger trapper"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
 msgstr ""
@@ -22313,5 +22370,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"
@@ -22319,5 +22376,5 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -22325,10 +22382,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 "Rediger motorveikryss"
 
 #. 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
@@ -22337,10 +22394,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 "Service"
@@ -22348,5 +22405,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 "Rediger Serviceområde"
@@ -22440,42 +22497,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 "Operatør"
@@ -22484,6 +22541,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 "Toaletter"
@@ -22491,5 +22548,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr ""
@@ -22497,5 +22554,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 ""
@@ -22503,5 +22560,5 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -22511,5 +22568,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -22519,5 +22576,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 "Type gangfelt"
@@ -22526,6 +22583,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 "ukontrollert"
@@ -22534,6 +22591,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 "trafikklys"
@@ -22542,6 +22599,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 "trafikkøy"
@@ -22550,6 +22607,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 "umerket"
@@ -22558,6 +22615,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 "Kryssende ridevei"
@@ -22566,6 +22623,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 "Kryssende sykkelvei"
@@ -22574,11 +22631,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 "Betjent fotgjengerfelt"
 
 #. 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 "Crossing type name (UK)"
@@ -22586,5 +22643,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"
@@ -22592,5 +22649,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 "pelican"
@@ -22598,5 +22655,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 "toucan"
@@ -22604,5 +22661,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 "puffin"
@@ -22610,5 +22667,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 "pegasus"
@@ -22616,5 +22673,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 "tiger"
@@ -22622,5 +22679,5 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr "Full stopp"
@@ -22628,5 +22685,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -22637,15 +22694,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 "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "clockwise"
 msgstr "med_klokka"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:804
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -22654,15 +22711,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 "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr "Fartsdemping"
@@ -22670,40 +22727,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 "Rediger fartsdemping"
 
 #. 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 "Passeringspunkt"
@@ -22711,5 +22768,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 "Rediger passeringspunkt"
@@ -22717,5 +22774,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 "Vendesirkel"
@@ -22725,5 +22782,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 "Bygrense"
@@ -22731,15 +22788,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 "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:837
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:839
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -22749,5 +22806,5 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
 msgstr "Strøkasse"
@@ -22756,17 +22813,6 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "Vadested"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "Rediger vadested"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -22774,5 +22820,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 "Rediger fjellpass"
@@ -22784,7 +22830,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 "Høyde"
@@ -22819,18 +22865,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 ""
@@ -22838,5 +22884,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Stengsel"
@@ -22844,5 +22890,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -22850,5 +22896,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 "Rediger sperresøyle"
@@ -22898,27 +22944,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 "Tillatt trafikk:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:876
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:884
+#: build/trans_presets.java:886
 msgid "Block"
 msgstr "Steinblokk"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:895
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -22926,10 +22972,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 "Rediger ferist"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -22937,15 +22983,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:910
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:911
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:922
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -22953,5 +22999,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 "Rediger bomstasjon"
@@ -22959,10 +23005,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -22971,5 +23017,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "Hekk"
@@ -22978,24 +23024,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr "Gjerde"
 
-#. <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 "Mur"
@@ -23003,5 +23068,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "Bymur"
@@ -23010,5 +23075,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 "Støttemur"
@@ -23019,15 +23084,15 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:973
+#: build/trans_presets.java:972
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:973
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
 msgstr "Port"
@@ -23035,50 +23100,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 "Rediger port"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1009
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1010
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1021
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1022
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:1033
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1034
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -23086,25 +23151,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 "Rediger gjerdetrapp"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1052
 msgid "Turnstile"
 msgstr "Rotasjonsport"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1053
 msgid "Edit Turnstile"
 msgstr "Rediger rotasjonsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1061
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1062
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -23114,6 +23179,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 "Vann"
@@ -23121,5 +23186,5 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
 msgstr "Drenering"
@@ -23127,10 +23192,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 "Rediger drenering"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr "Dike"
@@ -23138,10 +23203,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 "Rediger dike"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1095
 msgid "Stream"
 msgstr "Bekk"
@@ -23149,10 +23214,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 "Rediger bekk"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "Kanal"
@@ -23160,10 +23225,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 "Rediger kanal"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "Elv"
@@ -23173,5 +23238,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 "Rediger elv"
@@ -23179,5 +23244,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Vannkilde"
@@ -23185,20 +23250,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 "Rediger vannkilde"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "Terskeldam"
@@ -23206,10 +23271,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 "Rediger terskeldam"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Demning"
@@ -23217,10 +23282,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 "Rediger demning"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
 msgstr ""
@@ -23228,5 +23293,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 ""
@@ -23236,15 +23301,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1159
 msgid "Basin"
 msgstr "Basseng"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1160
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -23252,15 +23317,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 "Rediger drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1172
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1173
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -23268,20 +23333,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 "Rediger vann"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "Rediger land"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -23289,10 +23354,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 "Rediger kystlinje"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -23301,5 +23366,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 "Rediger elvebredd"
@@ -23307,5 +23372,5 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -23316,15 +23381,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 "Rediger våtmarksområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "Sumpområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr "Flytemyr"
@@ -23337,40 +23402,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 "myrområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr "Sivområde"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "Mangrove"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Strand"
@@ -23378,20 +23443,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 "Rediger strand"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "Klippe"
@@ -23399,15 +23464,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 "Rediger klippe"
 
 #. 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 "Fergeleie"
@@ -23415,20 +23480,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 "Rediger fergeleie"
 
 #. 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 ""
@@ -23514,26 +23579,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 "sykkel"
 
 #. 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 "Fergerute"
@@ -23541,5 +23606,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 "Rediger fergerute"
@@ -23548,15 +23613,15 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "Brygge"
@@ -23564,10 +23629,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 "Rediger brygge"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -23576,5 +23641,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 "Snuplass"
@@ -23584,5 +23649,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -23592,10 +23657,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 "Rediger båtslipp"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1282
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -23603,10 +23668,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 "Rediger skipsverft"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1289
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -23614,20 +23679,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 "Rediger tørrdokk"
 
 #. 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 "Jernbane"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "Jernbane"
@@ -23635,5 +23700,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 "Rediger jernbane"
@@ -23663,7 +23728,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 ""
@@ -23679,8 +23744,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 ""
@@ -23694,8 +23759,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 "Stasjonsområde"
@@ -23709,8 +23774,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 "Sidespor"
@@ -23724,8 +23789,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 "Privat sidespor"
@@ -23738,8 +23803,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 ""
@@ -23752,8 +23817,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 ""
@@ -23782,4 +23847,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
@@ -23814,12 +23886,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
@@ -23837,9 +23910,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 "Spenning"
@@ -23852,8 +23925,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 ""
@@ -23866,8 +23939,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 ""
@@ -23875,10 +23948,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1313
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. 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 "Rediger smal jernbane"
@@ -23886,5 +23959,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "Monorail"
@@ -23892,5 +23965,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 "Rediger Monorail"
@@ -23898,10 +23971,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1337
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1338
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
@@ -23909,10 +23982,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1349
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1350
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
@@ -23920,10 +23993,10 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1361
 msgid "Subway"
 msgstr "T-bane"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1362
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
@@ -23931,10 +24004,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "Trikk"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr "Rediger trikk"
@@ -23942,5 +24015,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -23948,5 +24021,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 "Rediger busspor"
@@ -23955,10 +24028,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
@@ -23967,10 +24040,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 "Alternative typer"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1411
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -23979,5 +24052,5 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -23986,5 +24059,5 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -23994,5 +24067,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -24000,5 +24073,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -24007,5 +24080,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 ""
@@ -24014,10 +24087,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -24025,5 +24098,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 "Rediger stolheis"
@@ -24045,12 +24118,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 "Referansenummer"
@@ -24076,14 +24149,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 ""
@@ -24101,10 +24174,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 ""
@@ -24112,5 +24185,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 ""
@@ -24120,6 +24193,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 ""
@@ -24127,5 +24200,5 @@
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -24133,5 +24206,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 "Rediger T-krokheis"
@@ -24139,5 +24212,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "Taubane"
@@ -24145,10 +24218,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 "Rediger taubane"
 
 #. 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 ""
@@ -24156,5 +24229,5 @@
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -24162,10 +24235,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 "Rediger gondolbane"
 
 #. 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 ""
@@ -24173,5 +24246,5 @@
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
 msgstr ""
@@ -24179,10 +24252,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 ""
@@ -24190,5 +24263,5 @@
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
 msgstr ""
@@ -24196,5 +24269,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 ""
@@ -24202,5 +24275,5 @@
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
 msgstr ""
@@ -24208,5 +24281,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 ""
@@ -24214,5 +24287,5 @@
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
 msgstr ""
@@ -24220,5 +24293,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 ""
@@ -24226,5 +24299,5 @@
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
 msgstr ""
@@ -24232,5 +24305,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 ""
@@ -24238,5 +24311,5 @@
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
 msgstr ""
@@ -24244,5 +24317,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 ""
@@ -24250,5 +24323,5 @@
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24256,5 +24329,5 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
@@ -24264,5 +24337,5 @@
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
@@ -24271,5 +24344,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"
@@ -24277,5 +24350,5 @@
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24284,5 +24357,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"
@@ -24300,6 +24373,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 "Parkering"
@@ -24308,5 +24381,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 "Rediger parkering"
@@ -24314,5 +24387,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 "P-hus"
@@ -24320,5 +24393,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 "Overflateparkering"
@@ -24326,10 +24399,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 "P-kjeller"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
 msgstr ""
@@ -24340,7 +24413,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 "Gebyr"
@@ -24348,25 +24421,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"
-#: build/trans_presets.java:1597
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
 #. 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 ""
@@ -24374,5 +24447,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -24382,5 +24455,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 "Rediger bensinstasjon"
@@ -24393,117 +24466,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 ""
@@ -24596,48 +24669,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 "Åpningstider"
@@ -24728,47 +24801,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 ""
@@ -24860,47 +24933,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 ""
@@ -24970,126 +25043,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 ""
@@ -25097,5 +25170,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr ""
@@ -25103,20 +25176,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 "Bilvask"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1640
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
@@ -25124,5 +25197,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr "Bilforretning"
@@ -25130,5 +25203,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 "Rediger bilforretning"
@@ -25136,20 +25209,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 "Verksted"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
 
 #. 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 ""
@@ -25157,5 +25230,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 ""
@@ -25199,15 +25272,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 "Telefonnummer"
@@ -25232,14 +25305,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 ""
@@ -25267,15 +25340,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 ""
@@ -25300,14 +25373,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 ""
@@ -25317,6 +25390,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 "Utleie"
@@ -25325,10 +25398,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 "Rediger bilutleie"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
 msgstr "Bildeling"
@@ -25336,5 +25409,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 "Rediger bildeling"
@@ -25343,16 +25416,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 "Kapasitet"
 
 #. 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 ""
@@ -25360,25 +25433,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"
@@ -25386,5 +25459,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25392,5 +25465,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25398,5 +25471,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25407,6 +25480,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 ""
@@ -25414,35 +25487,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 ""
@@ -25452,6 +25525,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 "Klær"
@@ -25459,10 +25532,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 "Rediger sykkelparkering"
 
+#. 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 "Sykkelforretning"
@@ -25471,40 +25590,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 "Rediger sykkelforretning"
 
 #. 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 ""
@@ -25513,10 +25632,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 "Rediger sykkelutleie"
 
 #. 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"
@@ -25524,5 +25643,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -25532,5 +25651,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"
@@ -25538,5 +25657,5 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -25544,5 +25663,5 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr ""
@@ -25550,5 +25669,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 "Rediger jernbanestopp"
@@ -25556,5 +25675,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -25563,5 +25682,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 "Rediger trikkestopp"
@@ -25569,5 +25688,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -25576,5 +25695,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 "Rediger jernbaneplattform"
@@ -25586,5 +25705,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 "Spornummer"
@@ -25593,11 +25712,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 "Område"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -25606,5 +25725,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 "Rediger T-baneinngang"
@@ -25612,5 +25731,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 "Rullestol"
@@ -25619,5 +25738,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -25626,5 +25745,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 "Rediger busstasjon"
@@ -25632,5 +25751,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -25640,5 +25759,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 "Rediger bussholdeplass"
@@ -25647,6 +25766,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
@@ -25658,10 +25777,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 "Benk"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
 msgstr ""
@@ -25669,10 +25788,10 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1841
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -25680,10 +25799,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 ""
@@ -25692,6 +25811,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 "Mynter"
@@ -25700,6 +25819,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 "Sedler"
@@ -25708,6 +25827,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 "Elektronisk lommebok eller betalingskort"
@@ -25716,6 +25835,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 "Bankkort"
@@ -25724,6 +25843,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 "Kredittkort"
@@ -25731,10 +25850,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 "kundekort"
 
 #. item "Taxi"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Taxi"
 msgstr "Taxi"
@@ -25742,5 +25861,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 "Rediger taxi-stasjon"
@@ -25748,10 +25867,10 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "Flyplass"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
 msgstr ""
@@ -25759,5 +25878,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 ""
@@ -25765,10 +25884,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"
@@ -25777,5 +25896,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr "Rullebane"
@@ -25783,5 +25902,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 "Rediger rullebane"
@@ -25789,5 +25908,5 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
 msgstr "Taksebane"
@@ -25795,5 +25914,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 "Rediger taksebane"
@@ -25801,5 +25920,5 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
 msgstr "Helikopterdekk"
@@ -25807,5 +25926,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 "Rediger helikopterdekk"
@@ -25815,5 +25934,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 "Oppstillingsplass"
@@ -25823,5 +25942,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"
@@ -25832,6 +25951,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 "Fyrlykt"
@@ -25841,5 +25960,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 "Vindpølse"
@@ -25848,5 +25967,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr "Terminal"
@@ -25854,10 +25973,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 "Rediger terminal"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1935
 msgctxt "airport"
 msgid "Gate"
@@ -25866,15 +25985,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 "Rediger terminalutgang"
 
 #. 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 ""
@@ -25886,5 +26005,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"
@@ -25893,5 +26012,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 "Rediger hotell"
@@ -25905,8 +26024,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 "Stjerner"
@@ -25942,12 +26061,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 ""
@@ -25968,12 +26087,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 ""
@@ -25994,12 +26113,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 ""
@@ -26026,12 +26145,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 "stasjon"
@@ -26052,12 +26171,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 ""
@@ -26080,12 +26199,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 ""
@@ -26107,12 +26226,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 ""
@@ -26134,12 +26253,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 ""
@@ -26161,17 +26280,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"
@@ -26179,20 +26298,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 "Rediger motell"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -26200,10 +26319,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 "Rediger feriehytter"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -26211,15 +26330,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 "Rediger ungdomsherberge"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2033
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2034
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
@@ -26227,10 +26346,10 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
@@ -26238,30 +26357,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 "Campingplass"
@@ -26269,10 +26388,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 "Rediger campingplass"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -26283,5 +26402,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 "Restaurant"
@@ -26289,5 +26408,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 "Rediger restaurant"
@@ -26296,6 +26415,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 "Kjøkken"
@@ -26303,5 +26422,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 "italiensk"
@@ -26309,5 +26428,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 "kinesisk"
@@ -26315,5 +26434,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"
@@ -26321,5 +26440,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 "gatekjøkken"
@@ -26327,5 +26446,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 "gresk"
@@ -26333,5 +26452,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 "tysk"
@@ -26339,5 +26458,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 "indisk"
@@ -26345,5 +26464,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 "lokal"
@@ -26351,5 +26470,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"
@@ -26357,5 +26476,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 "tyrkisk"
@@ -26363,5 +26482,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 "asiatisk"
@@ -26369,5 +26488,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 "thai"
@@ -26375,5 +26494,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 "meksikansk"
@@ -26381,5 +26500,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 "japansk"
@@ -26387,5 +26506,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 ""
@@ -26393,5 +26512,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 ""
@@ -26399,5 +26518,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 ""
@@ -26405,10 +26524,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 "Gatekjøkken"
@@ -26416,20 +26535,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 "Rediger gatekjøkken"
 
 #. 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 ""
@@ -26437,10 +26556,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 "Kafé"
@@ -26448,15 +26567,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 "Rediger kafé"
 
 #. 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"
@@ -26464,20 +26583,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 "Rediger pub"
 
 #. 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 "Rediger Biergarten"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr "Bar"
@@ -26485,10 +26604,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 "Rediger bar"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2219
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -26496,25 +26615,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 "Rediger nattklubb"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Turisme"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -26522,10 +26641,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 "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
@@ -26533,20 +26652,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2257
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "Detail Grade"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "Topografisk"
@@ -26579,32 +26698,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 "Gater"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
 msgstr "Diagram"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
 msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
 msgstr "Sted"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "By"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "Region"
@@ -26613,6 +26732,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 "Nærmere forklaring"
@@ -26622,5 +26741,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 "Ruter for:"
@@ -26628,5 +26747,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 "Tursti"
@@ -26635,6 +26754,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 "Sykling"
@@ -26642,5 +26761,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 "Fjellsykling"
@@ -26649,6 +26768,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 "Ski"
@@ -26656,5 +26775,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 "Riding"
@@ -26662,50 +26781,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 "… andre typer transport mulig"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
 msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "notice"
 msgstr "Merknad"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "history"
 msgstr "Historisk"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "Natur"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
 msgstr "Dyreliv"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr "Planter"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2282
 msgid "Guidepost"
 msgstr "Veiviser"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2297
 msgid "Information Terminal"
 msgstr "Informasjonsterminal"
@@ -26713,10 +26832,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 "Nærmere beskrivelse"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr "Lydomviser"
@@ -26724,25 +26843,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 "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "Fritid"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Kino"
@@ -26751,10 +26870,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 "Rediger kino"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -26763,10 +26882,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 "Rediger  zoologisk hage"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
 msgstr ""
@@ -26775,45 +26894,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 "Temapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr ""
@@ -26823,5 +26942,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 ""
@@ -26849,20 +26968,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 "Adkomst"
@@ -26870,5 +26989,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Lekeplass"
@@ -26876,15 +26995,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 "Rediger lekeplass"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
@@ -26892,10 +27011,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 "Bålplass"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
 msgstr ""
@@ -26903,15 +27022,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"
@@ -26919,30 +27033,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 "Fiskeplass"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. 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 "Museum"
@@ -26950,10 +27059,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 "Rediger museum"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Teater"
@@ -26962,10 +27071,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 "Rediger teater"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Bibliotek"
@@ -26974,10 +27083,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 "Rediger bibliotek"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -26985,10 +27094,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 "Rediger kunstsenter"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -26996,10 +27105,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 "Rediger kunstverk"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -27009,5 +27118,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 "Rediger tilbedelsessted"
@@ -27016,6 +27125,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 "Religion"
@@ -27024,6 +27133,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 "bahai"
@@ -27032,6 +27141,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 "buddhist"
@@ -27040,6 +27149,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 "kristen"
@@ -27048,6 +27157,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"
@@ -27056,6 +27165,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 "jain"
@@ -27064,6 +27173,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 "jødisk"
@@ -27072,6 +27181,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 "muslim"
@@ -27080,6 +27189,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"
@@ -27088,6 +27197,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"
@@ -27096,6 +27205,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"
@@ -27104,6 +27213,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 "unitarisk"
@@ -27112,6 +27221,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 "zoroastrisk"
@@ -27120,6 +27229,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 "Trosretniing"
@@ -27128,6 +27237,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 "anglikansk"
@@ -27136,6 +27245,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"
@@ -27144,6 +27253,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 "katolsk"
@@ -27152,6 +27261,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 "evangelisk"
@@ -27160,6 +27269,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 "Jehovas vitner"
@@ -27168,6 +27277,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 "luthersk"
@@ -27176,6 +27285,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"
@@ -27184,6 +27293,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 "mormoner"
@@ -27192,6 +27301,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 "ortodoks"
@@ -27200,6 +27309,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 "pinsebevegelsen"
@@ -27208,6 +27317,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 "presbyteriansk"
@@ -27216,6 +27325,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 "protestant"
@@ -27224,6 +27333,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 "quaker"
@@ -27232,6 +27341,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 "shia"
@@ -27240,36 +27349,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 "sunni"
 
 #. 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 ""
@@ -27277,15 +27386,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 ""
@@ -27293,5 +27402,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 "Offentlig bygning"
@@ -27299,10 +27408,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 "Rediger offentlig bygning"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Rådhus"
@@ -27310,5 +27419,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 "Rediger rådhus"
@@ -27317,10 +27426,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 "Ambassade"
@@ -27328,10 +27437,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 "Rediger ambassade"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Domstol"
@@ -27340,10 +27449,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 "Rediger domstol"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Fengsel"
@@ -27352,10 +27461,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 "Rediger fengsel"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
 msgstr "Politi"
@@ -27365,10 +27474,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 "Rediger politi"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -27377,10 +27486,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 "Rediger brannstasjon"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Postkontor"
@@ -27388,25 +27497,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 "Rediger postkontor"
 
 #. 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 "Barnehage"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "Skole"
@@ -27414,10 +27523,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 "Rediger skole"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Universitet"
@@ -27425,10 +27534,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 "Rediger universitet"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
 msgstr "Høyskole"
@@ -27436,10 +27545,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 "Rediger høyskole"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr ""
@@ -27447,20 +27556,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 "Helse"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Sykehus"
@@ -27468,10 +27577,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 "Rediger sykehus"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
 msgstr "Lege"
@@ -27479,25 +27588,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 "Rediger lege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
 #. 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 ""
@@ -27505,5 +27614,5 @@
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -27511,5 +27620,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 "Rediger apotek"
@@ -27517,10 +27626,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2596
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2600
 msgid "Hearing Aids"
 msgstr ""
@@ -27528,5 +27637,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 ""
@@ -27534,5 +27643,5 @@
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
 msgstr "Babyboks"
@@ -27540,5 +27649,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 "Rediger babyboks"
@@ -27546,5 +27655,5 @@
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -27553,5 +27662,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 "Rediger redningsmøtepunkt"
@@ -27560,15 +27669,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 "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2625
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. 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 "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -27577,5 +27686,5 @@
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -27584,10 +27693,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 "Rediger veterinær"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr "begrenset"
@@ -27595,15 +27704,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 "Kommentar"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Telefon"
@@ -27612,15 +27721,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 "Rediger telefon"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr ""
@@ -27629,5 +27738,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 ""
@@ -27637,5 +27746,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 ""
@@ -27643,5 +27752,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"
@@ -27650,5 +27759,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"
@@ -27656,5 +27765,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
@@ -27662,5 +27771,5 @@
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
@@ -27668,60 +27777,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 ""
@@ -27729,5 +27833,5 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -27736,5 +27840,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 "Rediger returstasjon"
@@ -27742,40 +27846,40 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. 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 "Søppeldunk"
@@ -27783,5 +27887,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 "Rediger søppeldunk"
@@ -27790,30 +27894,30 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2707
 msgid "Backrest"
 msgstr "Ryggstø"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "Material"
 msgstr "Material"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "stone"
 msgstr "stein"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "plastic"
 msgstr "plast"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgid "Colour"
 msgstr "Farge"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "black"
@@ -27821,5 +27925,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
@@ -27827,5 +27931,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
@@ -27833,5 +27937,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
@@ -27839,5 +27943,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
@@ -27845,5 +27949,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
@@ -27851,5 +27955,5 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
@@ -27857,20 +27961,20 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2710
 msgid "Amount of Seats"
 msgstr "Antall seter"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "Edit Shelter"
 msgstr "Rediger ly"
 
 #. 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"
@@ -27878,5 +27982,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"
@@ -27884,5 +27988,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"
@@ -27890,5 +27994,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"
@@ -27896,10 +28000,10 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -27908,10 +28012,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 "Høyde"
 
 #. 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"
@@ -27919,20 +28023,20 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
 msgstr "halv"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
 msgstr "full"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr "Lås"
@@ -27940,5 +28044,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -27947,10 +28051,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 "Rediger drikkevann"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -27959,5 +28063,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 "Rediger hydrant"
@@ -27965,5 +28069,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"
@@ -27971,5 +28075,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
@@ -27977,5 +28081,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
@@ -27983,16 +28087,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"
@@ -28000,5 +28104,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"
@@ -28006,5 +28110,5 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -28012,26 +28116,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 ""
@@ -28039,20 +28138,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 "Sport"
 
 #. 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 "Rediger stadion"
@@ -28066,6 +28165,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 "velg sport:"
@@ -28411,34 +28510,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"
@@ -28448,6 +28547,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 "flerbruk"
@@ -28457,6 +28556,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 "bueskyting"
@@ -28466,6 +28565,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 "turn"
@@ -28475,6 +28574,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 ""
@@ -28484,6 +28583,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 "australsk fotball"
@@ -28493,6 +28592,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"
@@ -28502,6 +28601,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 "basketball"
@@ -28511,6 +28610,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"
@@ -28520,6 +28619,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 "bowls"
@@ -28529,6 +28628,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 ""
@@ -28538,6 +28637,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 "kano"
@@ -28547,6 +28646,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 "klatring"
@@ -28556,6 +28655,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 "cricket"
@@ -28565,6 +28664,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 "cricketnett"
@@ -28574,6 +28673,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 "krocket"
@@ -28583,6 +28682,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 "sykling"
@@ -28592,6 +28691,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 "hundeløp"
@@ -28601,6 +28700,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 "ridning"
@@ -28610,6 +28709,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 ""
@@ -28619,6 +28718,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"
@@ -28628,6 +28727,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 "gymnastikk"
@@ -28637,6 +28736,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 "ishockey"
@@ -28646,6 +28745,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 "hesteløp"
@@ -28655,6 +28754,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 "motorsport"
@@ -28664,6 +28763,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"
@@ -28673,6 +28772,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"
@@ -28682,6 +28781,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 ""
@@ -28691,6 +28790,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 ""
@@ -28700,6 +28799,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 "skyting"
@@ -28709,6 +28808,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 "skateboard"
@@ -28718,6 +28817,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 "skøyter"
@@ -28727,6 +28826,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 "ski"
@@ -28736,6 +28835,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 "fotball"
@@ -28745,6 +28844,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 "svømming"
@@ -28754,6 +28853,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 "bordtennis"
@@ -28763,71 +28862,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 "Sportssenter"
 
 #. 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 "Rediger sportssenter"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. 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 "Rediger golfbane"
 
 #. 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 "Rediger minigolf"
 
 #. 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 "Flerbruk"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -28875,25 +28974,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 "type"
@@ -28943,26 +29042,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 "bane"
@@ -29012,26 +29111,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 "sportssenter"
@@ -29076,149 +29175,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 "bowling"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -29226,60 +29325,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 "Rediger ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "slalom"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "langrenn"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
 msgstr "snøpark"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "begynner"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "enkel"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
 msgstr "vanskelig"
 
 #. 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 "fristil"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "Skyting"
@@ -29287,105 +29386,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 "Rediger skyting"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
 #. 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 "Baseball"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr ""
@@ -29393,10 +29492,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 ""
@@ -29404,120 +29503,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 "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr "golfbane"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
 #. 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 "Rediger pelota"
 
 #. 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 "Rediger racquet"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
 #. 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 "Rediger tennis"
@@ -29525,40 +29624,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 ""
@@ -29566,20 +29665,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 ""
@@ -29587,10 +29686,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 "Menneskeskapt"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "Bygning"
@@ -29598,25 +29697,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 "Tårn"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. 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 ""
@@ -29625,5 +29724,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 "Høyde (meter)"
@@ -29631,5 +29730,5 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
 msgstr ""
@@ -29639,15 +29738,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr ""
@@ -29655,10 +29754,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 "Vindmølle"
@@ -29666,20 +29765,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 "Rediger vindmølle"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -29688,5 +29787,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 "Rediger rørledning"
@@ -29730,8 +29829,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
@@ -29741,10 +29840,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 "gass"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr ""
@@ -29752,20 +29851,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 "Område"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underwater"
@@ -29773,5 +29872,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"
@@ -29779,5 +29878,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Kran"
@@ -29785,10 +29884,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 "Rediger kran"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr ""
@@ -29797,25 +29896,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 ""
@@ -29823,5 +29922,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 ""
@@ -29829,5 +29928,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 ""
@@ -29835,5 +29934,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 ""
@@ -29842,6 +29941,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 "kull"
@@ -29849,5 +29948,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 ""
@@ -29855,5 +29954,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 ""
@@ -29861,5 +29960,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 ""
@@ -29867,5 +29966,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 ""
@@ -29873,5 +29972,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 ""
@@ -29879,5 +29978,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 ""
@@ -29885,5 +29984,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 ""
@@ -29891,5 +29990,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 ""
@@ -29897,5 +29996,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 ""
@@ -29903,5 +30002,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 ""
@@ -29909,5 +30008,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 ""
@@ -29915,5 +30014,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 ""
@@ -29921,5 +30020,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 ""
@@ -29927,10 +30026,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 ""
@@ -29938,10 +30037,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 ""
@@ -29949,10 +30048,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 ""
@@ -29960,15 +30059,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. 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 "Rediger vanntårn"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr ""
@@ -29976,10 +30075,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 "Kloakkrenseanlegg"
@@ -29989,10 +30088,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 "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr ""
@@ -30000,10 +30099,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 "Fontene"
@@ -30012,10 +30111,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 "Rediger fontene"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr ""
@@ -30023,5 +30122,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 ""
@@ -30029,5 +30128,5 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -30035,5 +30134,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 "Rediger fyrtårn"
@@ -30041,10 +30140,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 "Rediger fyrlykt"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3224
 msgid "Street Lamp"
 msgstr ""
@@ -30052,5 +30151,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 ""
@@ -30059,15 +30158,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 ""
@@ -30075,55 +30174,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"
@@ -30131,5 +30230,5 @@
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -30137,10 +30236,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 "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3248
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -30148,30 +30247,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 "Rediger overvåkingskamera"
 
 #. 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 "Kraftverk"
@@ -30181,140 +30280,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 "Rediger kraftverk"
 
 #. 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 "vann"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "atom"
 
 #. 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 "vind"
 
 #. 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 "solcelle"
 
 #. 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 ""
@@ -30322,10 +30421,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 ""
@@ -30340,9 +30439,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 ""
@@ -30357,9 +30456,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 ""
@@ -30374,9 +30473,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 ""
@@ -30391,54 +30490,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 "Kraftstasjon"
@@ -30447,10 +30546,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 "Rediger kraftstasjon"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -30459,5 +30558,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 "Rediger transformatorstasjon"
@@ -30465,10 +30564,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 "Linjenummer"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr ""
@@ -30477,5 +30576,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 ""
@@ -30483,5 +30582,5 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -30492,5 +30591,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 "Rediger kraftmast"
@@ -30498,10 +30597,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 ""
@@ -30510,5 +30609,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 ""
@@ -30516,10 +30615,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 "Kraftlinje"
@@ -30528,15 +30627,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 "Rediger kraftlinje"
 
 #. 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"
@@ -30544,5 +30643,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"
@@ -30550,40 +30649,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 "Historiske steder"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Slott"
@@ -30592,20 +30691,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 "Rediger slott"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -30614,10 +30713,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 "Rediger arkeologisk plass"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -30625,10 +30724,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 "Rediger slagmark"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
 msgstr "Paleontologisk sted"
@@ -30636,5 +30735,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 "Rediger paleontologisk sted"
@@ -30642,15 +30741,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 "Rediger monument"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -30658,60 +30757,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 "Rediger minneplatte"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
 msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
 msgstr "Rediger grensestein"
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "Butikker"
 
 #. 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 "Supermarked"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -30719,10 +30818,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 "Rediger minimarked"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -30730,5 +30829,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 "Rediger kiosk"
@@ -30736,5 +30835,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Baker"
@@ -30742,10 +30841,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 "Rediger baker"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Slakter"
@@ -30753,10 +30852,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 "Rediger slakter"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr ""
@@ -30764,10 +30863,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 ""
@@ -30775,10 +30874,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 ""
@@ -30786,5 +30885,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 ""
@@ -30792,5 +30891,5 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr ""
@@ -30798,10 +30897,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 ""
@@ -30809,15 +30908,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 "Økologisk"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
@@ -30825,5 +30924,5 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -30831,25 +30930,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 "Rediger sprit og vin"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3491
+#: build/trans_presets.java:3492
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3493
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
 #. 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 ""
@@ -30857,20 +30956,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 "Sko"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -30878,10 +30977,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 "Rediger friluftsutstyr"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
@@ -30889,5 +30988,5 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -30895,10 +30994,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 "Rediger renseri"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -30906,20 +31005,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 "Rediger vaskeri"
 
 #. 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 ""
@@ -30927,35 +31026,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 "Dataelektronikk"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr ""
@@ -30963,10 +31062,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 ""
@@ -30974,35 +31073,35 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:3589
 msgid "Edit Vacuum Cleaner"
 msgstr ""
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3596
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
 #. 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 "Rediger video"
 
 #. group "Cash"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3609
 msgid "Cash"
 msgstr "Valuta"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Bank"
@@ -31010,5 +31109,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 "Rediger bank"
@@ -31016,10 +31115,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 "Minibank"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Vekslingssted"
@@ -31027,5 +31126,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 "Rediger vekslingssted"
@@ -31033,10 +31132,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 "Rediger minibank"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
 msgstr ""
@@ -31044,10 +31143,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 ""
@@ -31055,5 +31154,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 ""
@@ -31061,35 +31160,35 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr "Hygiene"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
 msgstr "Rediger hygiene"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr ""
@@ -31097,10 +31196,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 ""
@@ -31108,5 +31207,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 ""
@@ -31114,5 +31213,5 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "Blomster"
@@ -31120,10 +31219,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 "Rediger blomster"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -31131,5 +31230,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 "Rediger hagesenter"
@@ -31137,5 +31236,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -31143,10 +31242,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 "Rediger byggevare"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -31154,10 +31253,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 "Rediger jernvarehandel"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3719
 msgid "Paint"
 msgstr ""
@@ -31165,5 +31264,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 ""
@@ -31171,15 +31270,15 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
 msgstr ""
@@ -31187,10 +31286,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 ""
@@ -31198,10 +31297,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 ""
@@ -31209,5 +31308,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 ""
@@ -31215,15 +31314,15 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
 msgstr ""
@@ -31231,15 +31330,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 "Bokhandel"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3779
 msgid "Edit Book Store"
 msgstr "Rediger bokhandel"
@@ -31247,15 +31346,15 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Reisebyrå"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
 msgstr "Rediger reisebyrå"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr ""
@@ -31263,20 +31362,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 "Leker"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
 msgstr ""
@@ -31284,10 +31383,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 "Automat"
@@ -31295,5 +31394,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 "Rediger automat"
@@ -31301,180 +31400,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 "Automatprodukter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
 msgstr "billetter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "mat"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "drikke"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "godter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "sigaretter"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
 msgstr "fotografier"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "dyremat"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "aviser"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "leker"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "frimerker"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "kuponger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "bicycle_tube"
 msgstr "sykkelslanger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "condoms"
 msgstr "kondomer"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "tamponger"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. 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 "Geografi"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. 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 "Rediger nasjonalparkgrense"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Steder"
 
 #. 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 "Rediger kontinent"
 
 #. 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"
@@ -31482,10 +31581,10 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31493,25 +31592,25 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Region"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
 msgstr "Kommune"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -31519,5 +31618,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
@@ -31526,10 +31625,10 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:3903
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:3909
 msgid "Town"
 msgstr "By"
@@ -31537,10 +31636,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 "Rediger by"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -31548,35 +31647,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 "Rediger forstad/bydel"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
 
 #. 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 ""
@@ -31584,5 +31683,5 @@
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
 msgstr "Lokalitet"
@@ -31590,10 +31689,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 "Rediger lokalitet"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3956
+#: build/trans_presets.java:3957
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -31601,10 +31700,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 "Rediger fjelltopp"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Isbre"
@@ -31612,10 +31711,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 "Rediger isbre"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Vulkan"
@@ -31623,10 +31722,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 "Rediger vulkan"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -31634,5 +31733,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 "Rediger huleinngang"
@@ -31640,5 +31739,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Øy"
@@ -31646,10 +31745,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 "Rediger øy"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
 msgstr "Holme"
@@ -31657,15 +31756,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 "Rediger holme"
 
 #. 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 "Tre"
@@ -31674,15 +31773,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 "Rediger tre"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
 msgstr "Skogsområde"
@@ -31691,10 +31790,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 "Rediger skogsområde"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
@@ -31702,5 +31801,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
@@ -31708,5 +31807,5 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
@@ -31714,5 +31813,5 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Skog"
@@ -31721,30 +31820,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 "Rediger skog"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "barskog"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "løvskog"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "blandingsskog"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -31752,15 +31851,15 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
 msgstr "Fjell"
@@ -31768,20 +31867,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 "Rediger fjell"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "Beite"
@@ -31789,15 +31888,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 "Rediger beite"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -31806,40 +31905,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 "Rediger gårdstun"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31847,15 +31946,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 "Hageparseller"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -31863,25 +31962,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr "Friområde"
@@ -31889,10 +31988,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 "Rediger friområde"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4123
 msgid "Common"
 msgstr "Offentlig"
@@ -31900,20 +31999,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 "Rediger offentlig"
 
 #. 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 "Rediger park"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -31921,5 +32020,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 "Rediger friluftsområde"
@@ -31927,15 +32026,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -31943,10 +32042,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 "Rediger gravlund"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -31954,40 +32053,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 "Rediger kirkegård"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
 msgstr ""
@@ -31995,10 +32094,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 "Jernbanegrunn"
@@ -32006,15 +32105,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 "Rediger jernbanegrunn"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -32022,55 +32121,55 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
 msgstr ""
@@ -32078,5 +32177,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
@@ -32087,5 +32186,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 "Rediger adresseinformasjon"
@@ -32093,5 +32192,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Husnummer"
@@ -32099,5 +32198,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Husnavn"
@@ -32106,55 +32205,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 "Gatenavn"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Landskode"
 
 #. 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 ""
@@ -32162,5 +32261,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
@@ -32172,5 +32271,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 "Rediger interpolasjon"
@@ -32178,35 +32277,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "oddetall"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "partall"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
 msgstr "alfabetisk"
 
 #. 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 "Bilde"
@@ -32216,5 +32315,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 "Rediger multipolygon"
@@ -32226,5 +32325,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 "ytre linjesegment"
@@ -32232,5 +32331,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 "indre linjesegment"
@@ -32238,5 +32337,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr "Grense"
@@ -32247,5 +32346,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 "Rediger grense"
@@ -32253,46 +32352,51 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "Boundary type"
 msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "administrative"
 msgstr "administrativ"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "national"
 msgstr "nasjonal"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "civil"
 msgstr "kommunegrense"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "political"
 msgstr "politisk"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4296
+#: build/trans_presets.java:4297
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:4302
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4303
 msgid "Administration centre"
 msgstr "Administrativt senter"
 
+#. 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 "Svingeforbud"
@@ -32301,5 +32405,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 "Rediger svingeforbud"
@@ -32307,40 +32411,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 "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -32349,15 +32453,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "fra linje"
 
 #. 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 "til linje"
@@ -32365,5 +32469,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "Rute"
@@ -32377,5 +32481,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 "Rediger rute"
@@ -32385,5 +32489,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 "Rutetype"
@@ -32391,5 +32495,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
@@ -32399,5 +32503,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 "vei"
@@ -32405,5 +32509,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 "ferge"
@@ -32411,5 +32515,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"
@@ -32462,9 +32566,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 "fotgjenger"
@@ -32472,5 +32576,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 "tur"
@@ -32478,5 +32582,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
@@ -32486,5 +32590,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 "omkjøring"
@@ -32498,6 +32602,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
@@ -32507,5 +32611,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 "Symbolforklaring"
@@ -32517,6 +32621,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 "Nettverk"
@@ -32524,5 +32628,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 "Rutetilstand"
@@ -32530,5 +32634,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 "planlagt"
@@ -32536,5 +32640,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 "alternativ"
@@ -32542,5 +32646,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 "midlertidig"
@@ -32548,5 +32652,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 "forbindelse"
@@ -32554,5 +32658,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 "Farge (hex)"
@@ -32564,15 +32668,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 "rutesegment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4343
+#: build/trans_presets.java:4345
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4344
+#: build/trans_presets.java:4346
 msgid "backward segment"
 msgstr "forrige segment"
@@ -32580,5 +32684,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 "stoppepunkt"
@@ -32586,5 +32690,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 "neste stoppunkt"
@@ -32592,5 +32696,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 "forrige stoppunkt"
@@ -32598,5 +32702,5 @@
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
 msgstr ""
@@ -32610,25 +32714,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 ""
@@ -32636,5 +32740,5 @@
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr ""
@@ -32642,5 +32746,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 ""
@@ -32649,5 +32753,5 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr ""
@@ -32655,5 +32759,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr ""
@@ -32661,10 +32765,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 ""
@@ -32859,6 +32963,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 "avleggs"
@@ -32890,5 +32994,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 "hest"
@@ -33043,10 +33147,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 "hinder"
@@ -33091,5 +33192,5 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
 msgstr "motortrafikkvei"
@@ -33133,7 +33234,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 "traktorvei"
@@ -33207,5 +33308,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 "service"
@@ -33217,5 +33318,5 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
 msgstr "vadested"
@@ -33233,5 +33334,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 ""
@@ -33242,5 +33343,5 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
 msgstr "vendesirkel"
@@ -33253,5 +33354,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 "redningsmøtepunkt"
@@ -33263,5 +33364,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 "elvebredd"
@@ -33273,5 +33374,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "bekk"
@@ -33283,5 +33384,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "tørrdokk"
@@ -33471,17 +33572,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 "menneskeskapt"
@@ -33493,5 +33594,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
 msgstr "stryk"
@@ -33539,9 +33640,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 "jernbanepunkt"
+
+#. <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"/>
@@ -33558,10 +33677,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 "annen bane"
 
 #. color railover
-#: build/trans_style.java:966
+#: build/trans_style.java:981
 msgid "railover"
 msgstr "jernbanebro"
@@ -33589,7 +33708,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 "nedlagt bane"
@@ -33624,6 +33743,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 "luftfart"
@@ -33641,5 +33760,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 "luftfart, mørk"
@@ -33657,5 +33776,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 "luftfart, lys"
@@ -33715,8 +33834,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 "taubane"
@@ -33730,5 +33849,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 "nedfart enkel"
@@ -33740,5 +33859,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 "nedfart middels"
@@ -33750,5 +33869,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 "nedfart avansert"
@@ -33760,5 +33879,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 "nedfart ekspert"
@@ -33770,5 +33889,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 "nedfart friløp"
@@ -33780,5 +33899,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 "nedfart nybegynner"
@@ -33907,13 +34026,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 "kraft"
@@ -33924,5 +34043,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 "brygge"
@@ -33934,5 +34053,5 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
 msgstr "rørgate"
@@ -34048,13 +34167,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 "fritid"
@@ -34066,5 +34185,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "marina"
@@ -34138,10 +34257,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 "fasilitet"
@@ -34225,11 +34344,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 "fasilitet – trafikk"
@@ -34565,24 +34684,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 "fasilitet – lys"
@@ -34608,6 +34727,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 "små vannsteder"
@@ -34654,8 +34773,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 "helse"
@@ -35024,34 +35143,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 "butikk"
@@ -35107,8 +35226,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"
@@ -35184,9 +35303,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 "turisme"
@@ -35254,9 +35373,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 "historisk"
@@ -35323,9 +35442,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 "grønn"
@@ -35336,5 +35455,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "steinbrudd"
@@ -35346,5 +35465,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -35362,5 +35481,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 "vannmagasin"
@@ -35372,5 +35491,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "skog"
@@ -35382,5 +35501,5 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
 msgstr ""
@@ -35392,5 +35511,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "gårdstun"
@@ -35409,5 +35528,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 "butikker"
@@ -35419,5 +35538,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "industri"
@@ -35429,5 +35548,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -35439,5 +35558,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "byggeområde"
@@ -35449,5 +35568,5 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -35492,7 +35611,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 "militært"
@@ -35504,5 +35623,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "gravlund"
@@ -35513,5 +35632,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "fjelltopp"
@@ -35524,5 +35643,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 "isbre"
@@ -35534,5 +35653,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 "vulkan"
@@ -35574,8 +35693,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 "natur"
@@ -35587,5 +35706,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "krattskog"
@@ -35597,5 +35716,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "beiteområde"
@@ -35607,5 +35726,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr "skogsområde"
@@ -35617,5 +35736,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "søle"
@@ -35627,5 +35746,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "strand"
@@ -35685,8 +35804,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 "rute"
@@ -35765,12 +35884,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 "grense"
@@ -35886,11 +36005,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 "sted"
@@ -35902,5 +36021,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-data"
@@ -35936,6 +36055,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"
@@ -36176,9 +36295,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"
@@ -36186,44 +36304,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 ""
@@ -36231,11 +36336,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 ""
@@ -36243,73 +36347,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>
@@ -36317,29 +36448,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 "Gater 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>
@@ -36347,13 +36493,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>
@@ -36361,13 +36507,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>
@@ -36375,13 +36521,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>
@@ -36391,273 +36537,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 "Tsjekkisk 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 "Tsjekkisk 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-kart"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr ""
 
 #. <type>wms</type>
-#. <url><![CDATA[http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&]]></url>
+#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}]]></url>
 #. <country-code>GB</country-code>
 #. </entry>
-#. <!--false;NPE Maps (Tim);http://timsc.dev.openstreetmap.org/wms2/map.php?-->
-#. <entry>
-#. <name>NPE Maps (Tim)</name>
-#: build/trans_wms.java:236
-msgid "NPE Maps (Tim)"
-msgstr "NPE-kart (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 ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
-#. <country-code>GB</country-code>
-#. </entry>
-#. <!--only for Japan-->
-#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO)</name>
-#: build/trans_wms.java:251
-msgid "MLIT Japan (ORTHO)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO01)</name>
-#: build/trans_wms.java:258
-msgid "MLIT Japan (ORTHO01)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO02)</name>
-#: build/trans_wms.java:265
-msgid "MLIT Japan (ORTHO02)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO03)</name>
-#: build/trans_wms.java:272
-msgid "MLIT Japan (ORTHO03)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
+#.
 #. <!--only for Italy-->
-#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#.
 #. <entry>
 #. <name>Lodi - Italy</name>
-#: build/trans_wms.java:280
+#: build/trans_wms.java:533
 msgid "Lodi - Italy"
 msgstr "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 "Sicilia, 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>
@@ -36665,35 +37634,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 ""
@@ -36705,9 +37690,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 ""
@@ -39129,4 +40115,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
@@ -39712,18 +40715,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 ""
@@ -40403,16 +41406,15 @@
 msgstr "Mål"
 
-#: ../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 ""
@@ -40466,80 +41468,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
@@ -40547,35 +41583,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
@@ -40583,8 +41633,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
@@ -40594,11 +41652,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 ""
 
@@ -41993,4 +43082,12 @@
 #, 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 ""
 
@@ -42168,4 +43265,24 @@
 msgstr ""
 
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "Ja, slett noder"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Slette noder utenfor nedlastede data-områder"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "Nei, avbryt"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "Vil du slette dem uansett?"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "Slette node utenfor data-områder?"
+
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
@@ -42227,9 +43344,4 @@
 msgid "Error while exporting {0}: {1}"
 msgstr "feil under eksport av {0}: {1}"
-
-#: ../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 "Linje: "
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
@@ -42917,9 +44029,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 ""
@@ -43014,17 +44126,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 ""
@@ -43747,4 +44859,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
@@ -43766,27 +44894,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 "Åpne en 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
-#, fuzzy
-msgid "Configure custom URL"
-msgstr "Konfigurer"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
@@ -43845,6 +44958,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 ""
 
@@ -43962,5 +45105,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 ""
@@ -43974,5 +45117,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 ""
@@ -43987,12 +45130,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 ""
 
@@ -44326,2 +45483,36 @@
 msgid "Drive a race car on this layer"
 msgstr ""
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "Open Aerial Map"
+
+#~ msgid "Overlapping areas"
+#~ msgstr "Overlappende områder"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
+
+#~ msgid "Info about Element"
+#~ msgstr "Informasjon om element"
+
+#~ msgid "NPE Maps"
+#~ msgstr "NPE-kart"
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "NPE-kart (Tim)"
+
+#~ msgid ""
+#~ "The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+#~ "This may lead to wrong coordinates."
+#~ msgstr ""
+#~ "Kartprojeksjonen «{0}» i URL og valgt kartprojeksjon «{1}» passer ikke.\n"
+#~ "Dette resulterer i feil koordinater."
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Yahoo Sat"
+#~ msgstr "Yahoo Sat"
+
+#~ msgid "Object history"
+#~ msgstr "Objekthistorie"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 26723)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 26724)
@@ -4,30 +4,12 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
-#. <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-08-31 13:02+0000\n"
-"Last-Translator: knoestgait <Unknown>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"POT-Creation-Date: 2011-09-27 19:09+0200\n"
+"PO-Revision-Date: 2011-09-13 10:29+0000\n"
+"Last-Translator: DiGro <Unknown>\n"
+"Language-Team: Dutch\n"
 "Language: nl\n"
 "MIME-Version: 1.0\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:18+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
@@ -56,5 +38,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ongeldige bestands-URL negeren: \"{0}\""
+msgstr "Ongeldige URL voor bestand negeren: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:484
@@ -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"
@@ -142,5 +125,6 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
-"Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs"
+"Parameter \"downloadgps\" accepteert geen bestandsnamen of URL's voor "
+"bestanden"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:603
@@ -157,5 +141,5 @@
 msgstr ""
 "<h2>JOSM maakt gebruik van Java versie 6.</h2>Gedetecteerde Java versie: {0}."
-"<br>U kan <ul><li>uw Java (JRE) bijwerken of</li><li>een oudere (Java 5 "
+"<br>U kunt <ul><li>uw Java (JRE) bijwerken of</li><li>een oudere (Java 5 "
 "compatibele) versie van JOSM gebruiken.</li></ul>Meer informatie:"
 
@@ -170,14 +154,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
@@ -188,7 +172,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
@@ -204,6 +188,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
@@ -213,5 +197,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
@@ -265,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
-msgstr "Het informatiescherm tonen."
+msgstr "Het scherm Over JOSM... tonen."
 
 #. TODO: put in a platformHook for system that have no console by default
@@ -290,5 +274,5 @@
 #, java-format
 msgid "Last change at {0}"
-msgstr "Laatste verandering op {0}"
+msgstr "Laatste wijziging op {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
@@ -349,7 +333,7 @@
 "page for OSM object will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"OPGELET: onverwacht formaat van het basis-API-URL-adres. Omleiding naar info "
-"of historiekpagina voor OSM-objecten zal waarschijnlijk mislukken. Het basis-"
-"API-URL-adres staat ingesteld op: ''{0}''"
+"WAARSCHUWING: onverwachte indeling van API basis-URL. Doorsturen naar de "
+"informatie- of geschiedenispagina voor een OSM-object zal waarschijnlijk "
+"mislukken. API basis-URL is: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -359,7 +343,7 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"WAARSCHUWING: de API basis-URL heeft een ongeldig formaat. Doorklikken naar "
-"de gebruikerspagina van een OSM-gebruiker zal waarschijnlijk mislukken. De "
-"API-basis-URL staat ingesteld op:  ''{0}''"
+"WAARSCHUWING: onverwachte indeling van API basis-URL. Doorsturen naar "
+"gebruikerspagina voor OSM-gebruiker zal waarschijnlijk mislukken. API basis-"
+"URL is: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -381,5 +365,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr "Klik om door te gaan en om {0} browservensters te openen"
+msgstr "Klik om door te gaan en {0} browservensters te openen"
 
 #. Strings in JFileChooser
@@ -397,8 +381,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
@@ -412,6 +396,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
@@ -423,6 +407,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
@@ -437,6 +421,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
@@ -458,7 +442,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
@@ -475,5 +461,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 "Annuleren"
@@ -481,14 +467,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr "Klik hier om het openen van de externe browservensters te annuleren"
+msgstr "Klik om het openen van de externe browservensters te annuleren"
 
 #: ../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 ""
-"Gelieve minstens één reeds opgeladen knooppunt, weg of relatie te selecteren."
+msgstr "Selecteer ten minste één reeds geüploade knoop, weg of relatie."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62
 msgid "Please select the target layer."
-msgstr "Gelieve de doellaag te selecteren."
+msgstr "Selecteer de doellaag."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:66
@@ -508,5 +494,5 @@
 "</html>"
 msgstr ""
-"<html>Er zijn geen lagen waarmee de bron laag<br>''{0}''<br> kan worden "
+"<html>Er zijn geen lagen waarmee de bronlaag<br>''{0}''<br> kan worden "
 "samengevoegd.</html>"
 
@@ -519,5 +505,5 @@
 #, java-format
 msgid "Add imagery layer {0}"
-msgstr "(Lucht)fotolaag {0} toevoegen als achtergrondafbeelding"
+msgstr "Afbeeldingslaag {0} toevoegen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
@@ -526,9 +512,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 msgid "Add Node..."
-msgstr "Knooppunt toevoegen..."
+msgstr "Knoop toevoegen..."
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
 msgid "Add a node by entering latitude / longitude or easting / northing."
 msgstr ""
+"Voeg een knooppunt toe door de breedte-/ lengtegraad of \"easting /northing"
+"\" in te vullen."
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -543,4 +531,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
@@ -589,5 +578,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
@@ -605,4 +594,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
@@ -623,5 +613,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
@@ -639,4 +629,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
@@ -650,5 +641,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
-msgstr "Gelieve minstens vier knopen te selecteren."
+msgstr "Selecteer ten minste vier knopen."
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140
@@ -668,8 +659,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
@@ -695,8 +686,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
 msgid "Please select at least three nodes."
-msgstr "Gelieve minstens drie knopen te selecteren:"
+msgstr "Selecteer ten minste drie knopen:"
 
 #: ../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 "gegevens"
@@ -717,5 +708,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "download"
-msgstr "download"
+msgstr "downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
@@ -741,5 +732,5 @@
 #, java-format
 msgid "Zoom the view to {0}."
-msgstr "Beeld inzoomen op {0}"
+msgstr "Weergave inzoomen op {0}."
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122
@@ -757,20 +748,21 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr "Wijzigingensetsbewerkvenster"
+msgstr "Venster Beheren wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
 msgid "Toggle visibility of Changeset Manager window"
-msgstr "Zichtbaarheid van het Wijzigingensetsbewerkvenster aan- of uitzetten"
+msgstr ""
+"Zichtbaarheid van het venster Beheren wijzigingensets aan- of uitzetten"
 
 #: ../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 "Sluit open wijzigingensets"
+msgstr "Geopende wijzigingensets sluiten"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 msgid "Closes open changesets"
-msgstr "Dit sluit openstaande wijzigingensets af"
+msgstr "Sluit geopende wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
@@ -783,6 +775,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
@@ -794,15 +786,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
-msgstr "Er zijn geen openstaande wijzigingensets"
+msgstr "Er zijn geen geopende wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
-msgstr "Geen open wijzigingensets"
+msgstr "Geen geopende wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
-msgstr "Ophalen open wijzigingensets"
+msgstr "Downloaden geopende wijzigingensets ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
@@ -817,5 +809,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61
 msgid "Change directions?"
-msgstr "Richting omkeren?"
+msgstr "Richtingen omkeren?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
@@ -828,6 +820,6 @@
 "reverse some of them?"
 msgstr ""
-"De wegen kunnen in hun huidige richtingen niet worden gecombineerd. Wil je "
-"de richting van enkele omkeren?"
+"De wegen kunnen niet worden gecombineerd in hun huidige richtingen.  Wilt u "
+"er enkele van omkeren?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
@@ -837,5 +829,5 @@
 msgstr ""
 "Deze wegen kunnen niet gecombineerd worden (Ze kunnen niet worden "
-"samengevoegd tot een opeenvolgende reeks van knooppunten)"
+"samengevoegd tot een enkele reeks knopen)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239
@@ -846,5 +838,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252
 msgid "Please select at least two ways to combine."
-msgstr "Selecteer twee of meer wegen om te combineren."
+msgstr "Selecteer ten minste twee of meer wegen om te combineren."
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
@@ -864,9 +856,10 @@
 msgstr "Selecteer iets om te kopiëren"
 
-#: ../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 "Coördinaten kopiëren"
 
-#: ../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 ""
@@ -881,9 +874,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 msgid "Create a circle from three selected nodes."
-msgstr "Een cirkel aanmaken op basis van drie geselecteerde knooppunten."
+msgstr "Een cirkel maken van drie geselecteerde knopen."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
 msgid "Those nodes are not in a circle. Aborting."
-msgstr "Deze knooppunten staan niet in een circel. Actie wordt geannuleerd."
+msgstr "Deze knopen staan niet in een cirkel. Afbreken."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
@@ -892,5 +885,5 @@
 "three nodes."
 msgstr ""
-"Selecteer precies twee of drie knopen; of een weg met precies twee of drie "
+"Selecteer precies twee of drie knopen; of één weg met precies twee of drie "
 "knopen."
 
@@ -918,5 +911,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:69
 msgid "You must select at least one way."
-msgstr "Je moet minstens één weg selecteren."
+msgstr "U moet minstens één weg selecteren."
 
 #. JButton
@@ -924,13 +917,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
@@ -942,5 +935,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
@@ -960,16 +953,16 @@
 #: ../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 "Overschrijven"
 
 #: ../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 "Bestand bestaat al. Overschrijven?"
+msgstr "Het bestand bestaat reeds. Overschrijven?"
 
 #. Do it!
@@ -978,9 +971,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
-msgstr "Knopen gelijikmatig verdelen"
+msgstr "Knopen gelijkmatig verdelen"
 
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "De geselecteerde knopen equidistant langs een lijn verdelen."
+msgstr "Verdeel de geselecteerde knopen op gelijke afstanden langs een lijn."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:29
@@ -991,14 +984,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:29
 msgid "Download map data from the OSM server."
-msgstr "Kaartgegevens downloaden van de OSM-server."
+msgstr "Kaartgegevens downloaden van de server van OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:59
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:60
 msgid "Download object..."
-msgstr "Object downloaden"
+msgstr "Object downloaden..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:59
 msgid "Download OSM object by ID."
-msgstr "OSM-object op basis van ID afhalen"
+msgstr "OSM-object op basis van ID downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:95
@@ -1039,10 +1032,11 @@
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:31
 msgid "Download referrers"
-msgstr "Referrers downloaden"
+msgstr "Verwijzingen downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
 msgid "Select if the referrers of the object should be downloaded as well"
 msgstr ""
-"Selecteer of de referrers van het object ook mee gedownload moeten worden."
+"Selecteer of de verwijzingen van het object eveneens gedownload moeten "
+"worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:118
@@ -1052,7 +1046,7 @@
 "<b>w123, n110, w12, r15</b><br/>"
 msgstr ""
-"Object IDs kunnen gescheiden worden door een komma of spatie. <br /> "
-"Bijvoorbeeld: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Specificeer "
-"in gemengde modus objecten als volgt: <b>w123, n110, w12, r15</b><br/>"
+"Object-ID's kunnen gescheiden worden door een komma of spatie. <br /> "
+"Bijvoorbeeld: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Specificeer, "
+"in gemengde modus, objecten als volgt: <b>w123, n110, w12, r15</b><br/>"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:151
@@ -1069,5 +1063,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:96
 msgid "Close dialog and cancel downloading"
-msgstr "Sluit dialoog en stop het downloaden"
+msgstr "Sluit dialoogvenster en stop het downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:173
@@ -1077,11 +1071,11 @@
 msgstr ""
 "Ongeldige ID-lijst gespecificeerd\n"
-" Kan het object niet ophalen."
+" Kan object niet downloaden."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:205
 msgid "Object could not be downloaded"
 msgid_plural "Some objects could not be downloaded"
-msgstr[0] "Object kan niet opgehaald worden"
-msgstr[1] "Enkele objecten kunnen niet opgehaald worden"
+msgstr[0] "Object kon niet gedownload worden"
+msgstr[1] "Enkele objecten konden niet gedownload worden"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:206
@@ -1089,6 +1083,6 @@
 msgid "One object could not be downloaded.<br>"
 msgid_plural "{0} objects could not be downloaded.<br>"
-msgstr[0] "Eén object kan niet opgehaald worden.<br>"
-msgstr[1] "{0} objecten kunnen niet opgehaald worden.<br>"
+msgstr[0] "Eén object kon niet gedownload worden.<br>"
+msgstr[1] "{0} objecten konden niet gedownload worden.<br>"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:210
@@ -1097,6 +1091,6 @@
 "does not know an object with the requested id."
 msgstr ""
-"De server antwoordde met response code 404.<br>Dit houdt normaal gesproken "
-"in dat de server het object met opgevraagde ID niet kent."
+"De server antwoordde met antwoordcode 404.<br>Dit houdt normaal gesproken in "
+"dat de server geen object met de opgevraagde ID kent."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:212
@@ -1115,6 +1109,6 @@
 msgid "One downloaded object is deleted."
 msgid_plural "{0} downloaded objects are deleted."
-msgstr[0] "Eén opgehaald object is verwijderd."
-msgstr[1] "{0} opgehaalde objecten zijn verwijderd."
+msgstr[0] "Eén gedownload object is verwijderd."
+msgstr[1] "{0} gedownloade objecten zijn verwijderd."
 
 #. content.add(scroller);
@@ -1132,9 +1126,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 msgid "Download parent ways/relations..."
-msgstr "Ophalen bovenliggende wegen/relaties"
+msgstr "Downloaden bovenliggende wegen/relaties..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 msgid "Download objects referring to one of the selected objects"
-msgstr "Objecten afhalen die naar de geselecteerde objecten verwijzen."
+msgstr ""
+"Objecten downloaden die naar één van de geselecteerde objecten verwijzen."
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
@@ -1159,8 +1154,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
 msgid "Make a duplicate of the currently selected layer."
-msgstr "Dupliceer de momenteel geselecteerde laag"
+msgstr "Dupliceer de huidige geselecteerde laag."
 
 #: ../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}"
@@ -1200,5 +1195,5 @@
 msgid "Continues drawing a line that shares nodes with another line."
 msgstr ""
-"Verder gaan met het tekenen van een lijn die knooppunten met een andere lijn "
+"Verder gaan met het tekenen van een lijn die knopen met een andere lijn "
 "deelt."
 
@@ -1230,22 +1225,37 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
 msgid "Nothing to export. Get some data first."
-msgstr "Geen gegevens om te exporteren, maak deze eerst."
+msgstr "Niets te exporteren. Verzamel eerst enkele gegevens."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
-msgstr "Exporteer als GPX-bestand"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
+msgstr "Exporteren als GPX-bestand"
+
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20
-msgid "Object history"
-msgstr "Geschiedenis voor geselecteerde objecten opvragen"
-
-#: ../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 "Geschiedenis"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Toon geschiedenis van wegen, knopen of relaties in OSM."
+msgstr ""
+"Toon informatie over de geschiedenis van wegen, knopen of relaties in OSM."
+
+#: ../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
 msgid "New offset"
-msgstr "Nieuwe verschuiving achtergrondafbeelding"
+msgstr "Nieuwe verschuiving"
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:47
@@ -1286,5 +1296,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"
@@ -1298,14 +1308,14 @@
 "If you want to save the offset as bookmark, enter the bookmark name below"
 msgstr ""
-"Maak gebruik van de pijltjestoetsen om de achtergrondafbeelding/luchtfoto te "
-"verplaatsen.\n"
-"Het is ook mogelijk om de oostelijke en noordelijke verschuiving in de {0}-"
-"coördinaten op te geven.\n"
-"Indien u de verschuiving wenst op te slaan als een bladwijzer, gelieve "
-"hiervoor dan hieronder een naam op te geven"
+"Gebruik de pijltjestoetsen of sleep de achtergrondafbeelding/luchtfoto met "
+"de muis om de verschuiving aan te passen.\n"
+"U kunt ook de oostelijke en noordelijke verschuiving in de {0} coördinaten "
+"opgeven.\n"
+"Als u de verschuiving wilt opslaan als een bladwijzer, voer dan hieronder "
+"een naam in"
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:166
 msgid "Offset: "
-msgstr "Offset: "
+msgstr "Verschuiving: "
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:168
@@ -1315,14 +1325,26 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:229
 msgid "Offset bookmark already exists. Overwrite?"
-msgstr "Er bestaat al een bladwijzer met deze naam. Deze overschrijven?"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
+msgstr "Bladwijzer voor verschuiving bestaat al. Overschrijven?"
+
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20
-msgid "Info about Element"
-msgstr "Info over element"
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Toon objectinformatie over wegen, knopen of relaties in OSM."
+#: ../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
@@ -1336,14 +1358,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:320
 msgid "Please select at least one closed way that should be joined."
-msgstr "Selecteer op z’n minst één gesloten weg die samengevoegd moet worden."
+msgstr ""
+"Selecteer ten minste één gesloten weg die samengevoegd zou moeten worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:327
 msgid "One of the selected ways is not closed and therefore cannot be joined."
 msgstr ""
-"Eén van de geselecteerde wegen vormt geen gesloten veelhoek en kan bijgevolg "
-"niet worden gebruikt om samen te voegen met de andere."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:81
+"Eén van de geselecteerde wegen is niet gesloten en kan daarom niet worden "
+"samengevoegd."
+
+#: ../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."
@@ -1357,121 +1383,124 @@
 "kaartgegevens"
 
-#: ../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 "Er kunnen hierdoor knopen verloren gaan"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344
+msgstr "Dit kan er toe leiden dat knopen per ongeluk verloren gaan."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:341
 msgid "Are you really sure to continue?"
 msgstr "Weet u echt zeker dat u door wilt gaan?"
 
-#: ../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 "Gelieve af te breken als u niet zeker bent"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:362
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:384
+msgstr "Annuleer als u niet zeker bent"
+
+#: ../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 "Geen kruispunt gevonden. Er is niets veranderd"
+msgstr "Geen kruispunt gevonden. Er is niets gewijzigd."
 
 #. 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 "Wijzigingen ongedaan maken"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435
 msgid "Removed duplicate nodes"
 msgstr "Dubbele knopen verwijderd"
 
-#: ../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 "Knooppunten toegevoegd op alle kruispunten"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505
+msgstr "Knoop toegevoegd op alle kruispunten"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498
 msgid "Assemble new polygons"
 msgstr "Nieuwe veelhoeken samenstellen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504
 msgid "Delete relations"
 msgstr "Relaties verwijderen"
 
-#: ../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 ""
-"Wegen die niet deel uitmaken van een binnenste multipolygoon verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519
+"Wegen die geen deel uitmaken van een binnenste multipolygoon verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512
 msgid "Joined overlapping areas"
-msgstr "Overlappende gebieden werden samengevoegd"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:522
+msgstr "Overlappende gebieden samengevoegd"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:515
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
 "verify no errors have been introduced."
 msgstr ""
-"Enkele wegen vormden onderdeel van relaties die zijn aangepast. Controleer "
-"of er geen fouten zijn geïntroduceerd."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581
+"Enkele wegen waren deel van relaties die zijn aangepast. Controleer of er "
+"geen fouten werden geïntroduceerd."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574
 msgid "Fix tag conflicts"
 msgstr "Los tagconflicten op"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848
 msgid "Split ways into fragments"
 msgstr "Splits wegen op in fragmenten"
 
-#: ../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 ""
-"Sorry. Multipolygoonrelaties met meerdere omvattende paden (role=outer) "
-"worden niet ondersteund."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251
+"Sorry. Kan geen relaties van multipolygoon afhandelen met meerdere buitenste "
+"wegen."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1244
 msgid ""
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
-"Sorry. Een weg die reeds de rol outer heeft in een andere "
-"multpolygoonrelatie, kan niet nog ’s die rol vervullen in deze relatie."
-
+"Sorry. Kan geen weg afhandelen die de buitenste is in meerdere relaties van "
+"multipolygoon."
+
+#: ../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 "
 "relations."
 msgstr ""
-"Sorry. Er is een pad dat tegelijkertijd de rollen inner en outer vervult in "
-"multipolygoonrelaties. Dit wordt niet ondersteund."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1268
+"Sorry. Kan geen weg afhandelen die zowel binnenste als buitenste is in "
+"relaties van multipolygoon."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1261
 msgid ""
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
-"Sorry. Een weg die reeds de rol inner heeft in een andere "
-"multpolygoonrelatie, kan niet nog ’s die rol vervullen in deze relatie."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370
+"Sorry. Kan geen weg afhandelen die de binnenste is in meerdere relaties van "
+"multipolygoon."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363
 msgid "Removed Element from Relations"
 msgstr "Element werd verwijderd uit relaties"
 
 #. 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 "Tags van binnenste wegen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465
 msgid "Join Areas Function"
-msgstr "Gebieden samenvoegen-functie"
+msgstr "Functie Gebieden samenvoegen"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
-msgstr "Knooppunt aan weg vastknopen"
+msgstr "Koppel knoop aan weg"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
-msgstr "Koppel een knooppunt met het dichtstbijzijnde wegsegment"
+msgstr "Koppel knoop met de dichtstbijzijnde wegsegmenten"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:85
@@ -1485,19 +1514,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 msgid "Jump To Position"
-msgstr "Naar positie springen"
+msgstr "Spring naar positie"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 msgid "Opens a dialog that allows to jump to a specific location"
 msgstr ""
-"Een dialoogvenster openen waarmee naar een bepaalde locatie kan worden "
+"Opent een dialoogvenster waarmee naar een specifieke locatie kan worden "
 "gesprongen."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
 msgid "Enter Lat/Lon to jump to position."
-msgstr "Lat/lon invoeren om naar toe te springen."
+msgstr "Lat/lon invoeren om naar positie te springen."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:61
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "Je kan ook een URL van www.openstreetmap.org inplakken."
+msgstr "U kunt ook een URL plakken vanaf www.openstreetmap.org."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:87
@@ -1513,5 +1542,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:93
 msgid "Zoom (in metres)"
-msgstr "Zoom (in meter)"
+msgstr "Zoomen (in meters)"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
@@ -1533,10 +1562,10 @@
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
-"Kan lengte- of breedtegraad of zoom niet ontleden. Gelieve deze te "
+"Kon lengte- of breedtegraad of zoom niet ontleden. Gelieve deze te "
 "controleren."
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:118
 msgid "Unable to parse Lon/Lat"
-msgstr "Kan lat/lon niet ontleden."
+msgstr "Kan lat/lon niet ontleden"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:67
@@ -1547,5 +1576,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
-msgstr "Uitgelijnde afbeeldingen van verschillende diensten afhalen"
+msgstr "Uitgelijnde afbeeldingen van verschillende diensten downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:71
@@ -1560,5 +1589,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
-msgstr "Eigen WMS-URL"
+msgstr "Eigen WMS-koppeling"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:114
@@ -1568,5 +1597,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:140
 msgid "Visit Homepage"
-msgstr "Homepage bezoeken"
+msgstr "Bezoek Homepage"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:151
@@ -1597,5 +1626,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
-msgstr "Voeg de huidige laag toe in een andere laag"
+msgstr "Voeg de huidige laag samen met een andere laag"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
@@ -1606,5 +1635,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
 msgid "Merge nodes into the oldest one."
-msgstr "Knopen in de oudste samenvoegen"
+msgstr "Knopen met de oudste samenvoegen."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:70
@@ -1613,6 +1642,6 @@
 "node."
 msgstr ""
-"Selecteer ten minste twee knooppunten om samen te voegen of een knooppunt "
-"dat dicht bij een andere ligt."
+"Selecteer ten minste twee knopen om samen te voegen of een knoop die dicht "
+"bij een andere knoop ligt."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:209
@@ -1622,5 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:211
 msgid "Click to abort merging nodes"
-msgstr "Klik om samenvoegen van knooppunten te stoppen"
+msgstr "Klik om samenvoegen van knopen te stoppen"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:218
@@ -1629,6 +1658,6 @@
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
-"Kan knooppunten niet samenvoegen: zou weg \"{0}\" moeten verwijderen, deze "
-"is in gebruik"
+"Kan knopen niet samenvoegen: Zou weg \"{0}\" moeten verwijderen die nog "
+"steeds in gebruik is."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:319
@@ -1644,5 +1673,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected objects into another layer"
-msgstr "Voeg de geselecteerde objecten toe aan een andere laag"
+msgstr "Voeg de geselecteerde objecten in een andere laag samen"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1675,4 +1704,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
@@ -1692,8 +1722,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 "omhoog"
@@ -1713,4 +1744,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
@@ -1730,8 +1762,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 "omlaag"
@@ -1775,14 +1808,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34
 msgid "Move Node..."
-msgstr "Knoop Verplaatsen..."
+msgstr "Knoop verplaatsen..."
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
 msgid "Edit latitude and longitude of a node."
-msgstr "Latitude en Longitude van een node aanpassen"
+msgstr "Breedtegraad en lengtegraad van een knoop aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
 msgid "New Layer"
-msgstr "Nieuwe Laag"
+msgstr "Nieuwe laag"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
@@ -1807,31 +1840,40 @@
 msgid "Cannot open {0} file with the file importer ''{1}''."
 msgid_plural "Cannot open {0} files with the file importer ''{1}''."
-msgstr[0] "Kan {0}-bestand niet openen met bestandimporttoepassing ''{1}''."
-msgstr[1] "Kan {0}-bestanden niet openen met bestandimporttoepassing ''{1}''."
+msgstr[0] ""
+"Kan {0} bestand niet openen met toepassing voor importeren van bestanden "
+"''{1}''."
+msgstr[1] ""
+"Kan {0} bestanden niet openen met toepassing voor importeren van bestanden "
+"''{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 ""
+"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] ""
-"Kan {0}-bestand niet openen wegens een er geen geschikte "
-"bestandimporttoepassing voorhanden is."
 msgstr[1] ""
-"Kan {0}-bestanden niet openen wegens een er geen geschikte "
-"bestandimporttoepassing voorhanden is."
-
-#: ../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 ""
-"<html>Kan map ''{0}'' niet openen.<br>Gelieve een bestand te selecteren.</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210
+msgstr "<html>Kan map ''{0}'' niet openen.<br>Selecteer een bestand.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1840,5 +1882,5 @@
 msgstr[1] "{0} bestanden aan het openen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1849,5 +1891,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
 msgid "Open Location..."
-msgstr "Locatie openen…"
+msgstr "Locatie openen...¦"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
@@ -1857,25 +1899,25 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:78
 msgid "Enter URL to download:"
-msgstr "URL om te downloaden invoeren"
+msgstr "Voer URL om te downloaden in:"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:80
 msgid "Enter an URL from where data should be downloaded"
-msgstr "Geef een URL waarvandaan de data gedownload moet worden"
+msgstr "Voer een URL in waarvandaan de gegevens gedownload moeten worden"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download Location"
-msgstr "Locatie downloaden"
+msgstr "Locatie voor downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
 msgid "Download URL"
-msgstr "Download-URL"
+msgstr "URL voor downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Start downloading data"
-msgstr "Start het downloaden van data"
+msgstr "Start het downloaden van gegevens"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:110
 msgid "Download Data"
-msgstr "Haal gegevens op"
+msgstr "Download gegevens"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
@@ -1887,11 +1929,10 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
-"<h3>Als een of meer van de wegen geselecteerd zijn, wordt de vorm zodanig "
-"aangepast dat alle hoeken 90 of 180 graden zijn.</h3>Er kunnen twee "
-"referentieknooppunten aan de selectie worden toegevoegd. In dat geval wordt "
-"de richting door deze twee knooppunten bepaald. (Daarna, is het altijd "
-"mogelijk bewegingen voor bepaalde knooppunten ongedaan te maken:"
-"<br>Selecteer deze knopen en druk op de sneltoetscombinatie voor Orthogonaal "
-"Trekken / Ongedaan Maken. Standaard is dit Shift+Q."
+"<h3>Als een of meer wegen zijn geselecteerd, wordt de vorm zodanig aangepast "
+"dat alle hoeken 90 of 180 graden zijn.</h3>Er kunnen twee knopen aan de "
+"selectie worden toegevoegd.  Daarna wordt de richting bepaald door deze twee "
+"verwijzingsknopen. (Daarna kunt u altijd de verplaatsing van bepaalde knopen "
+"ongedaan maken:<br>Selecteer die knopen en druk op de sneltoetscombinatie "
+"voor Loodrecht trekken / Ongedaan maken. De standaard is Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
@@ -1899,9 +1940,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:184
 msgid "Orthogonalize Shape"
-msgstr "Vorm orthogonaal maken"
+msgstr "Vorm loodrecht maken"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:50
 msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr "Verplaats knooppunten zodat alle hoeken 90 of 180 graden worden"
+msgstr "Verplaats knopen zodat alle hoeken 90 of 180 graden worden"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
@@ -1913,9 +1954,9 @@
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
-"Loodrecht maken van bepaalde knopen ongedaan maken voor bepaalde knooppunten"
+"Loodrecht maken van bepaalde knopen ongedaan maken voor bepaalde knopen"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Orthogonalize / Undo"
-msgstr "Orthogonaal Trekken / Ongedaan maken"
+msgstr "Loodrecht maken / Ongedaan maken"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:113
@@ -1925,11 +1966,11 @@
 "action!"
 msgstr ""
-"Vorm Orthogonaal Trekken / Ongedaan maken\n"
-"Gelieve knooppunten te selecteren die tijdens de vorige Orthogonaal trekken-"
-"actie onterecht verplaatst werden"
+"Vorm loodrecht maken / Ongedaan maken\n"
+"Selecteer knopen die tijdens de vorige actie Loodrecht maken werden "
+"verplaatst!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:115
 msgid "Undo Orthogonalize Shape"
-msgstr "Vorm Orthogonaal Trekken Ongedaan Maken"
+msgstr "Ongedaan maken Vorm loodrecht maken"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
@@ -1940,15 +1981,14 @@
 msgstr ""
 "<html>U maakt gebruik van de EPSG:4326-projectie.<br>Dit kan leiden tot "
-"onverwachte resultaten bij rechthoekig uitlijnen.<br>Verander het "
-"projectietype om deze waarschuwing te onderdrukken.<br>Wilt u doorgaan?</"
-"html>"
+"onverwachte resultaten bij rechthoekig uitlijnen.<br>Verander het type van "
+"de projectie om deze waarschuwing te onderdrukken.<br>Wilt u doorgaan?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:153
 msgid "Selection must consist only of ways and nodes."
-msgstr "De selectie mag uitsluitend wegen en knopen bevatten."
+msgstr "De selectie mag uitsluitend bestaan uit wegen en knopen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
 msgid "Orthogonalize"
-msgstr "Orthogonaal maken"
+msgstr "Loodrecht maken"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:183
@@ -1959,5 +1999,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:191
 msgid "Selected Elements cannot be orthogonalized"
-msgstr "Geselecteerde elementen kunnen niet recht worden gelegd."
+msgstr "Geselecteerde elementen kunnen niet loodrecht worden gemaakt."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:279
@@ -1966,16 +2006,16 @@
 "orthogonalize them one by one.</html>"
 msgstr ""
-"<html>Zorg a.u.b. dat alle geselecteerde wegen dezelfde richting wijzen."
-"<br>of zet ze één voor één orthogonaal.</html>"
+"<html>Zorg er voor dat alle geselecteerde wegen in dezelfde richting wijzen."
+"<br>of zet ze één voor één loodrecht.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:432
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr "Selecteer wegen met hoeken rond de 90 of 180 graden."
+msgstr "Selecteer wegen met hoeken van ongeveer 90 of 180 graden."
 
 #: ../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
@@ -1985,13 +2025,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 msgid "Paste contents of paste buffer."
-msgstr "Inhoud van het buffer plakken."
+msgstr "Inhoud van de buffer plakken."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153
 msgid "Delete incomplete members?"
-msgstr "Verwijder onvolledige leden?"
+msgstr "Onvolledige leden verwijderen?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
 msgid "Paste without incomplete members"
-msgstr "Plakken zonder onvolledige leden?"
+msgstr "Plakken zonder onvolledige leden"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156
@@ -2001,7 +2041,7 @@
 "objects?"
 msgstr ""
-"De gekopieerde gegevens bevatten onvolledige objecten. Bij het plakken "
-"zullen enkel de objecten gebruikt worden die beschikbaar zijn. Wenst u door "
-"te gaan met deze onvolledige groep objecten?"
+"De gekopieerde gegevens bevatten incomplete objecten.  Bij het plakken "
+"worden de incomplete objecten verwijderd.  Wilt u de gegevens plakken zonder "
+"deze incomplete objecten?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
@@ -2013,5 +2053,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items."
+msgstr "Pas tags van de inhoud van de buffer toe op alle geselecteerde items."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:255
@@ -2035,5 +2075,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr "Voorkeurendialoog voor de algemene instellingen openen."
+msgstr "Opent een dialoogvenster Voorkeuren voor algemene instellingen."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -2041,5 +2081,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:95
 msgid "Preferences"
-msgstr "Voorkeursinstellingen"
+msgstr "Voorkeuren"
 
 #. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
@@ -2051,5 +2091,5 @@
 msgid "Forget objects but do not delete them on server when uploading."
 msgstr ""
-"Objecten vergeten, maar niet verwijderen op de server bij volgende upload."
+"Objecten vergeten, maar niet van de server verwijderen bij volgende upload."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:62
@@ -2069,6 +2109,6 @@
 msgstr ""
 "Dit zorgt ervoor dat JOSM de geselecteerde objecten vergeet.<br> Ze worden "
-"lokaal uit de laag verwijderd, maar <i>niet</i> op de server bij de volgende "
-"upload."
+"uit de laag verwijderd, maar <i>niet</i> verwijderd van de server bij de "
+"volgende upload."
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:229
@@ -2077,6 +2117,6 @@
 "selected objects:"
 msgstr ""
-"De volgende objecten zullen eveneens worden opgeruimd.<br>Ze zijn "
-"afhankelijk van de door u geselecteerde:"
+"De volgende afhankelijke objecten zullen eveneens worden afgevoerd<br>in "
+"aanvulling op de geselecteerde objecten:"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:260
@@ -2089,10 +2129,10 @@
 "discarded.</html>"
 msgstr ""
-"Een aantal van de geselecteerde objecten werd in deze sessie gewijzigd."
-"<br>Selecteer doorgaan als deze eveneens mogen verwijderd worden.</html>"
+"Enkele objecten werden aangepast.<br>Ga door als deze wijzigingen moeten "
+"worden genegeerd.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280
 msgid "Clear Undo/Redo buffer"
-msgstr "Ongedaan maken/Opnieuw uitvoeren-buffer leegmaken"
+msgstr "Buffer voor Ongedaan maken/Opnieuw uitvoeren leegmaken"
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -2135,5 +2175,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:82
 msgid "Please select at least one way."
-msgstr "Selecteer minstens één weg."
+msgstr "Selecteer ten minste één weg."
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:101
@@ -2151,5 +2191,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 "Opslaan"
@@ -2163,48 +2203,48 @@
 #, java-format
 msgid "File {0} exists. Overwrite?"
-msgstr "Het bestand {0} bestaat al. Overschrijven?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+msgstr "Bestand {0} bestaat. Overschrijven?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "No Exporter found! Nothing saved."
-msgstr "Geen exporter gevonden! Niets opgeslagen."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgstr "Geen toepassing voor exporteren gevonden! Niets opgeslagen."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Empty document"
 msgstr "Leeg document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save anyway"
 msgstr "Toch opslaan"
 
-#: ../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 "Het document bevat geen gegevens."
 
 #. 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 "Conflicten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Reject Conflicts and Save"
 msgstr "Conflicten verwerpen en opslaan"
 
-#: ../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 "
 "if you rejected all. Continue?"
 msgstr ""
-"Er bevinden zich enkele onopgeloste conflicten in het document. Deze worden "
-"niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
+"Er zijn nog niet-opgeloste conflicten. Conflicten zullen niet worden "
+"opgeslagen en afgehandeld alsof ze allemaal genegeerd hebt. Doorgaan?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142
 msgid "Save OSM file"
 msgstr "OSM-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save GPX file"
 msgstr "GPX-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145
 msgid "Save Layer"
 msgstr "Laag opslaan"
@@ -2219,5 +2259,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:376
 msgid "Save the current data to a new file."
-msgstr "De huidige gegevens in een nieuw bestand opslaan."
+msgstr "Sla de huidige gegevens in een nieuw bestand op."
 
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -2231,6 +2271,6 @@
 "objects too."
 msgstr ""
-"Alle niet-gewiste objecten in de gegevenslaag selecteren. Hiermee worden ook "
-"incomplete objecten geselecteerd."
+"Alle niet-verwijderde objecten in de gegevenslaag selecteren.  Hiermee "
+"worden ook incomplete objecten geselecteerd."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
@@ -2242,5 +2282,6 @@
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
-"Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden"
+"Toont het statusrapport met zinvolle informatie dat bij een rapportage van "
+"problemen kan worden gevoegd"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
@@ -2255,8 +2296,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118
 msgid "Copy to clipboard and close"
-msgstr "Naar klembord kopiëren en afsluiten"
+msgstr "Naar klembord kopiëren en sluiten"
 
 #: ../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
@@ -2266,57 +2307,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 "Afsluiten"
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39
+msgstr "Sluiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36
 msgid "Simplify Way"
 msgstr "Weg vereenvoudigen"
 
-#: ../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 "Overbodige knopen uit een weg verwijderen."
 
-#: ../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 "Ja, knooppunten verwijderen"
-
-#: ../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 ""
-"Ook knooppunten verwijderen die buiten de binnengehaalde kaartgegevens "
-"vallen."
-
-#: ../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 "Neen, niet doen!"
-
-#: ../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 "Operatie annuleren"
-
-#: ../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 "Wilt u ze toch verwijderen?"
-
-#: ../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 "Knopen buiten de gegevensgebieden verwijderen?"
-
-#: ../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 "Selecteer minimaal één weg om te vereenvoudigen."
-
-#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112
+msgstr "Selecteer ten minste één weg om te vereenvoudigen."
+
+#: ../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
@@ -2327,10 +2333,16 @@
 msgstr "Ja"
 
-#: ../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 "Alle geselecteerde wegen vereenvoudigen"
 
-#: ../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 "Bewerking annuleren"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97
 #, java-format
@@ -2341,10 +2353,10 @@
 "vereenvoudigen?"
 
-#: ../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 "Wegen vereenvoudigen?"
 
-#: ../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
@@ -2354,5 +2366,5 @@
 msgstr[1] "{0} wegen vereenvoudigen"
 
-#: ../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)"
@@ -2368,5 +2380,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split a way at the selected node."
-msgstr "Een weg bij het geselecteerde knooppunt splitsen."
+msgstr "Een weg bij de geselecteerde knoop splitsen."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
@@ -2374,11 +2386,11 @@
 "The current selection cannot be used for splitting - no node is selected."
 msgstr ""
-"De huidige selectie kan niet worden gebruikt voor splitsing - er is geen "
-"knooppunt geselecteerd."
+"De huidige selectie kan niet worden gebruikt om te splitsen - er is geen "
+"knoop geselecteerd."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:129
 msgid "The selected nodes do not share the same way."
-msgstr "De geselecteerde knooppunten hebben niet dezelfde weg gemeen."
+msgstr "De geselecteerde knopen delen niet dezelfde weg."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:132
@@ -2398,9 +2410,9 @@
 "way also."
 msgstr[0] ""
-"Er is meer dan één weg die gebruikt maakt van het knooppunt die u "
-"geselecteerd heeft. Selecteer ook de weg."
+"Er is meer dan één weg die gebruikt maakt van de knoop die u geselecteerd "
+"heeft. Selecteer ook de weg."
 msgstr[1] ""
-"Er is meer dan één weg die gebruikt maakt van de knooppunten die u "
-"geselecteerd heeft. Selecteer ook de weg."
+"Er is meer dan één weg die gebruikt maakt van de knopen die u geselecteerd "
+"heeft. Selecteer ook de weg."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:248
@@ -2419,22 +2431,20 @@
 
 #: ../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 "
 "should verify this and correct it when necessary.</html>"
 msgstr ""
-"<html>De relaties waarvan deze weg deel uitmaakte zijn gekopieerd naar alle "
-"afgesplitste wegen, evenals de rollen die ze hadden.<br>U kan dit best even "
-"nakijken en aanpassen indien nodig.</html>"
+"<html>Een lid met een op een rol gebaseerde relatie is gekopieerd naar alle "
+"nieuwe wegen.<br>U zou dit moeten nakijken en indien nodig corrigeren.</html>"
 
 #: ../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 "
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>De relaties waarvan deze weg deel uitmaakte zijn gekopieerd naar alle "
-"afgesplitste wegen.<br>U kan dit best even nakijken en aanpassen indien "
-"nodig.</html>"
+"<html>En lid van een relatie waarvan is gekopieerd naar alle nieuwe wegen."
+"<br>U zou dit moeten nakijken en indien nodig corrigeren.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:459
@@ -2450,10 +2460,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
-msgstr "Teken lijnen tussen rauwe GPS-punten."
+msgstr "Teken lijnen tussen ruwe GPS-punten."
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
-msgstr "De algemene instelling \"{0}\" in-/uitschakelen"
+msgstr "De algemene instelling \"{0}\" in-/uitschakelen."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
@@ -2464,55 +2474,54 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Dupliceer knooppunten die door meerdere wegen worden gebruikt."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgstr "Dupliceer knopen die door meerdere wegen worden gebruikt."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:86
 msgid "This node is not glued to anything else."
-msgstr "De knoop is met niets anders verbonden."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+msgstr "De knoop is niet verbonden met iets anders."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of these nodes are glued to anything else."
-msgstr "Geen van deze knooppunten is met iets anders verbonden."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+msgstr "Geen van deze knopen is met iets anders verbonden."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
 msgid "None of this way''s nodes are glued to anything else."
-msgstr "Geen van deze weg z’n knooppunten is met iets anders verbonden."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+msgstr "Geen van de knopen van deze weg is met iets anders verbonden."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "The current selection cannot be used for unglueing."
 msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "Select either:"
-msgstr "Selecteer één van beide:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgstr "Selecteer óf:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One tagged node, or"
 msgstr "* Eén getagde knoop, of"
 
-#: ../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 "* één knooppunt dat gebruikt wordt door meer dan een weg, of"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgstr "* Eén knoop die gebruikt wordt door meer dan een weg, of"
+
+#: ../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 ""
-"* één knooppunt dat  gebruikt wordt door meer dan één weg, en één van die "
-"wegen, of"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+"* Eén knoop die gebruikt wordt door meer dan één weg en één van die wegen, of"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
-"* één weg die één of meerdere knooppunten heeft, die gebruikt worden door "
-"meer dan één weg, of"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+"* Eén weg die één of meer knopen heeft, die gebruikt worden door meer dan "
+"één weg, of"
+
+#: ../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 ""
-"* één weg en één of meer van zijn knooppunten, die gebruikt worden door meer "
-"dan één weg."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+"* Eén weg en één of meer van zijn knopen, die gebruikt worden door meer dan "
+"één weg."
+
+#: ../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"
@@ -2521,24 +2530,42 @@
 "own copy and all nodes will be selected."
 msgstr ""
-"Merk op: Als een weg geselecteerd is, dan krijgt deze weg nieuwe kopieën\n"
-"van de losgemaakte knopen en de nieuwe knopen zullen geselecteerd worden.\n"
-"Anders zouden alle wegen hun eigen kopie krijgen en alle knopen zouden\n"
+"Opmerking: Als een weg geselecteerd is, zal deze weg nieuwe kopieën\n"
+"van de losgemaakte knopen krijgen en de nieuwe knopen zullen geselecteerd "
+"worden. Anders zullen alle wegen hun eigen kopie krijgen en alle knopen "
+"zouden\n"
 "geselecteerd worden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173
 msgid "Unglued Node"
-msgstr "Losgemaakt knooppunt"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
+msgstr "Losgemaakte knoop"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:377
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplicaat in {0} knopen"
 
-#: ../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"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "{0} knooppunt in {1} knooppunten ontdubbelen"
-msgstr[1] "{0} knooppunten in {1} knooppunten ontdubbelen"
+msgstr[0] "{0} knoop in {1} knopen ontdubbelen"
+msgstr[1] "{0} knopen in {1} knopen ontdubbelen"
+
+#: ../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
@@ -2577,5 +2604,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
-msgstr "Alles (escape) deselecteren"
+msgstr "Alles deselecteren (Escape)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
@@ -2586,5 +2613,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Ververst de objecten in de aktieve data laag vanaf de server"
+msgstr "Werkt de objecten in de actieve gegevenslaag bij vanaf de server."
 
 #. bounds defined? => use the bbox downloader
@@ -2595,10 +2622,10 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
 msgid "Download data"
-msgstr "Ophalen data"
+msgstr "Ophalen gegevens"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:28
 msgid "Update modified"
-msgstr "Update veranderd"
+msgstr "Gewijzigde bijwerken"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26
@@ -2606,19 +2633,20 @@
 "Updates the currently modified objects from the server (re-downloads data)"
 msgstr ""
-"Update de huidig veranderde objecten van de server (download de data opnieuw)"
+"Werkt de huidig veranderde objecten bij vanaf de server (download de "
+"gegevens opnieuw)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
 msgid "No current dataset found"
-msgstr "Geen huidige dataset gevonden"
+msgstr "Geen huidige gegevensset gevonden"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 #, java-format
 msgid "Did not find an object with id {0} in the current dataset"
-msgstr "Kon geen object met id {0} in de huidige dataset vinden"
+msgstr "Kon geen object met id {0} in de huidige gegevensset vinden"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
 msgid "Update selection"
-msgstr "Ververs selectie"
+msgstr "Werk selectie bij"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
@@ -2626,9 +2654,10 @@
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
-"Update de huidige geselecteerde objecten van de server (herdownload data)"
+"Werkt de huidige geselecteerde objecten bij vanaf de server (download de "
+"gegevens opnieuw)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
 msgid "There are no selected objects to update."
-msgstr "Er zijn geen objecten geselecteerd om te verversen"
+msgstr "Er zijn geen objecten geselecteerd om bij te werken."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
@@ -2636,14 +2665,14 @@
 msgstr "Selectie leeg"
 
-#: ../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 "Upload data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
+msgstr "Gegevens bijwerken"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr "Verstuur alle wijzigingen in de aktieve data laag naar de OSM server"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
+msgstr "Upload alle wijzigingen in de actieve gegevenslaag naar de OSM-server"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
 msgid ""
@@ -2651,25 +2680,25 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
-"<html>De gegevens die naar de server verstuurd moeten worden, maken deel uit "
+"<html>De gegevens die naar de server verstuurd moeten worden maken deel uit "
 "van onopgeloste conflicten in laag \"{0}\".<br>U moet deze eerst oplossen.</"
 "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
 msgid "No changes to upload."
-msgstr "Geen aanpassingen aanwezig om te uploaden."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+msgstr "Geen wijzigingen om te uploaden."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:196
 msgid "Nothing to upload. Get some data first."
-msgstr "Niets om te uploaden. Creëer eerst gegevens."
+msgstr "Niets te uploaden. Verzamel eerst enkele gegevens."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:43
 msgid "Upload selection"
-msgstr "Selectie naar server versturen"
+msgstr "Selectie uploaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr "Verstuur alle wijzigingen in de huidige selectie naar de OSM server"
+msgstr "Upload alle wijzigingen in de huidige selectie naar de server van OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:254
@@ -2684,5 +2713,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:319
 msgid "Checking for deleted parents in the local dataset"
-msgstr "Controleren van verwijderde ouders in de lokale dataset"
+msgstr "Controleren van verwijderde ouders in de lokale gegevensset"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:47
@@ -2693,18 +2722,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:47
 msgid "Performs the data validation"
-msgstr "Gegevensvalidatie uitvoeren"
+msgstr "Voert de validatie van gegevens uit"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:122
 msgid "Validating"
-msgstr "Validatie bezig"
+msgstr "Valideren"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:166
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
-msgstr "Test {0}/{1}: wordt gestart {2}"
+msgstr "Test {0}/{1}: Starten {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ValidateAction.java:175
 msgid "Updating ignored errors ..."
-msgstr "Genegeerde fouten aan het bijwerken ..."
+msgstr "Bijwerken genegeerde fouten ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21
@@ -2715,24 +2744,24 @@
 msgid "Enable/disable automatic moving of the map view to last placed node"
 msgstr ""
-"Automatisch verschuiven van zicht naar laatst bewerkte knooppunt in-/"
+"Automatisch verplaatsen van kaartweergave naar laatste geplaatste knoop in-/"
 "uitschakelen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24
 msgid "Toggle Viewport Following"
-msgstr "Viewport dat GPS-positie volgt in-/uitschakelen"
+msgstr "Viewport volgt live GPS in-/uitschakelen"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:96
 msgid "Wireframe View"
-msgstr "Draadmodelweergave"
+msgstr "Weergave Draadmodel"
 
 #. no icon
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:28
 msgid "Enable/disable rendering the map as wireframe only"
-msgstr "Renderen van de kaart als draadmodel aanzetten/uitzetten"
+msgstr "Alleen als draadmodel renderen van de kaart aanzetten/uitzetten"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:29
 msgid "Toggle Wireframe view"
-msgstr "Draadmodelweergave in- of uitschakelen"
+msgstr "Weergave Draadmodel in- of uitschakelen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
@@ -2789,5 +2818,5 @@
 msgctxt "audio"
 msgid "Jump forward"
-msgstr "Naar voren springen"
+msgstr "Spring naar voren"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
@@ -2795,10 +2824,10 @@
 msgctxt "audio"
 msgid "Next Marker"
-msgstr "Volgende marker"
+msgstr "Volgende markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
 msgctxt "audio"
 msgid "Play next marker."
-msgstr "Speel vanaf volgende marker"
+msgstr "Speel vanaf volgende markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
@@ -2806,9 +2835,9 @@
 msgctxt "audio"
 msgid "Play/Pause"
-msgstr "Afspelen/Pauzeren"
+msgstr "Afspelen/Pauze"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 msgid "Play/pause audio."
-msgstr "Afspelen/Pauzeren geluid"
+msgstr "Afspelen/Geluid pauzeren"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
@@ -2816,10 +2845,10 @@
 msgctxt "audio"
 msgid "Previous Marker"
-msgstr "Vorige marker"
+msgstr "Vorige markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
 msgctxt "audio"
 msgid "Play previous marker."
-msgstr "Speel vanaf vorige marker"
+msgstr "Speel vanaf vorige markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
@@ -2856,14 +2885,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
 msgid "No data found in this area."
-msgstr "Geen data in dit gebied gevonden."
+msgstr "Geen gegevens in dit gebied gevonden."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:67
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
-msgstr "Download {0} van {1} ({2} te gaan)"
+msgstr "Downloaden {0} van {1} ({2} te gaan)"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
 msgid "Updating data"
-msgstr "data aan het updaten"
+msgstr "Bijwerken van gegevens"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:148
@@ -2876,6 +2905,6 @@
 "server"
 msgstr ""
-"Klik om te controleren of objecten in uw huidige dataset verwijderd zijn op "
-"de server"
+"Klik om te controleren of objecten in uw lokale gegevensset verwijderd zijn "
+"op de server"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154
@@ -2886,5 +2915,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:156
 msgid "Click to abort and to resume editing"
-msgstr "Klik om af te breken en verder te gaan met wijzigen"
+msgstr "Klik om af te breken en verder te gaan met bewerken"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162
@@ -2900,10 +2929,10 @@
 msgstr[0] ""
 "Er is {0} object in uw lokale gegevensset dat mogelijk verwijderd is op de "
-"server. Wanneer u dit object wilt verwijderen of bijwerken zal de server "
-"waarschijnlijk een conflict rapporteren."
+"server. Als u later probeert dit object te verwijderen of bij te werken zal "
+"de server waarschijnlijk een conflict rapporteren."
 msgstr[1] ""
 "Er zijn {0} objecten in uw lokale gegevensset die mogelijk verwijderd zijn "
-"op de server. Wanneer u dit object wilt verwijderen of bijwerken zal de "
-"server waarschijnlijk een conflict rapporteren."
+"op de server. Als u later probeert die objecten te verwijderen of bij te "
+"werken zal de server waarschijnlijk een conflict rapporteren."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
@@ -2932,10 +2961,10 @@
 #, java-format
 msgid "The following errors occurred during mass download: {0}"
-msgstr "De volgende fouten traden op gedurende bulk ophalen: {0}"
+msgstr "De volgende fouten traden op gedurende bulk downloaden: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
 msgid "Errors during download"
-msgstr "Fouten tijdens ophalen"
+msgstr "Fouten tijdens downloaden"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:179
@@ -2975,5 +3004,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete Mode"
-msgstr "Verwijdermodus"
+msgstr "modus Verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
@@ -3003,6 +3032,7 @@
 "when deleting a way. Ctrl: delete referring objects."
 msgstr ""
-"Klik om te verwijderen. SHIFT: verwijder wegsegment. ALT: ongebruikte knopen "
-"behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen."
+"Klik om te verwijderen. Shift: verwijder wegsegment. Alt: niet verwijderen "
+"van ongebruikte knopen bij verwijderen van een weg. Ctrl: verwijzende "
+"objecten verwijderen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:82
@@ -3018,5 +3048,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
 msgid "Mode: Draw Focus"
-msgstr "Modus: tekenmodus"
+msgstr "Modus: Tekenfocus"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:309
@@ -3026,5 +3056,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:484
 msgid "Add node"
-msgstr "Knooppunt toevoegen"
+msgstr "Knoop toevoegen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:486
@@ -3043,14 +3073,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:498
 msgid "Add node into way and connect"
-msgstr "Knoop in weg voegen en verbinden"
+msgstr "Knoop in weg toevoegen en koppelen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
 msgid "Create new node."
-msgstr "Nieuwe node maken."
+msgstr "Nieuwe knoop maken."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:893
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:917
 msgid "Select node under cursor."
-msgstr "Selecteer de node onder de cursor."
+msgstr "Selecteer knoop onder de cursor."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:895
@@ -3058,10 +3088,10 @@
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Nieuwe node toevoegen aan weg."
-msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
+msgstr[0] "Nieuwe knoop toevoegen aan weg."
+msgstr[1] "Nieuwe knopen toevoegen aan {0} wegen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:905
 msgid "Start new way from last node."
-msgstr "Start een nieuwe weg vanaf de node."
+msgstr "Begin nieuwe weg vanaf laatste knoop."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:907
@@ -3085,5 +3115,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:140
 msgid "Move a segment along its normal, then release the mouse button."
-msgstr "Verplaats een segment langs zijn normaal, en laat de muisknop los"
+msgstr "Verplaats een segment langs zijn normaal en laat dan de muisknop los."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:142
@@ -3091,6 +3121,5 @@
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
-"Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop "
-"loslaten."
+"Teken een rechthoek met de gewenste grootte en laat dan de muisknop los."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:146
@@ -3100,7 +3129,7 @@
 "node."
 msgstr ""
-"Sleep een wegsegment om een rechthoek te maken. Ctrl-sleep om een segment "
-"langs zijn normale te verplaatsen, Alt-sleep om een nieuwe rechthoek te "
-"maken, dubbelklik om een nieuwe knoop toe te voegen."
+"Sleep aan een wegsegment om een rechthoek te maken. Ctrl-sleep om een "
+"segment langs zijn normale te verplaatsen, Alt-sleep om een nieuwe rechthoek "
+"te maken, dubbelklik om een nieuwe knoop toe te voegen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:354
@@ -3129,5 +3158,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:184
 msgid "Hold Ctrl to toggle snapping"
-msgstr "Houd Ctrl ingedrukt om te wisseln met vangen"
+msgstr "Houd Ctrl ingedrukt om te wisselen met vangen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:534
@@ -3145,5 +3174,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:28
 msgid "Drag play head"
-msgstr "Speelkop verslepen"
+msgstr "Afspeelkop verslepen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:83
@@ -3152,13 +3181,13 @@
 "+release to synchronize audio at that point."
 msgstr ""
-"Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af "
+"Versleep de afspeelkop en laat los nabij track om het geluid vanaf daar af "
 "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren."
 
 #: ../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
@@ -3169,9 +3198,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
 msgid "Select"
-msgstr "Selecteer"
+msgstr "Selecteren"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150
 msgid "Select, move, scale and rotate objects"
-msgstr "Selecteer, verplaats, schaal en roteer objecten"
+msgstr "Objecten selecteren, verplaatsen, schalen en roteren"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:405
@@ -3179,10 +3208,10 @@
 msgid "Add and move a virtual new node to way"
 msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Een virtuele knoop toevoegen en naar een weg verplaatsen"
-msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen"
+msgstr[0] "Een virtuele nieuwe knoop toevoegen en naar een weg verplaatsen"
+msgstr[1] "Een virtuele nieuwe knoop toevoegen en naar {0} wegen verplaatsen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:755
 msgid "Move elements"
-msgstr "Verplaats elementen"
+msgstr "Elementen verplaatsen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
@@ -3192,5 +3221,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:756
 msgid "Undo move"
-msgstr "Verplaatsing ongedaan maken"
+msgstr "Verplaatsen ongedaan maken"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:758
@@ -3201,11 +3230,11 @@
 "Really move them?"
 msgstr ""
-"U heeft meer dan {0} elementen verplaatst. Het verplaatsen van een groot "
-"aantal elementen is meestal een fout.\n"
+"U verplaatste meer dan {0} elementen. Het verplaatsen van een groot aantal "
+"elementen is meestal een vergissing.\n"
 "Wilt u ze echt verplaatsen?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:918
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "De muisknop loslaten om de objecten in de rechthoek te selecteren."
+msgstr "Laat de muisknop los om de objecten in de rechthoek te selecteren."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:920
@@ -3213,14 +3242,14 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
-"De muisknop loslaten om het verplaatsen te stoppen. CTRL om samen te voegen "
+"Laat de muisknop los om het verplaatsen te stoppen. CTRL om samen te voegen "
 "met dichtstbijzijnde knoop."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:922
 msgid "Release the mouse button to stop rotating."
-msgstr "De muisknop loslaten om het roteren te stoppen."
+msgstr "Laat de muisknop los om het roteren te stoppen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:924
 msgid "Release the mouse button to stop scaling."
-msgstr "De muisknop loslaten om het herschalen te stoppen"
+msgstr "Laat de muisknop los om het op schaal brengen te stoppen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:926
@@ -3229,12 +3258,12 @@
 "Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
 msgstr ""
-"Verplaats objecten door ze te verslepen. Shift om toe te voegen aan de "
-"selectie (Ctrl om om te schakelen); Alt-Ctrl om de selectie te herschalen of "
-"om de selectie te wijzigen"
+"Objecten verplaatsen door ze te verslepen. Shift om toe te voegen aan de "
+"selectie (Ctrl om te wisselen); Shift-Ctrl om geselecteerde te roteren; Alt-"
+"Ctrl om de selectie op schaal te brengen of om de selectie te wijzigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 msgid "Zoom"
-msgstr "Zoom"
+msgstr "Inzoomen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44
@@ -3247,6 +3276,6 @@
 "move zoom with right button"
 msgstr ""
-"Zoom door slepen of CTRL+. of CTRL+,; verplaats met CTRL+omhoog, links, "
-"omlaag, rechts; verplaats met rechter knop"
+"Zoom door te slepen of Ctrl+. of Ctrl+,; verplaatsen met Ctrl+up, links, "
+"omlaag, rechts; zoom verplaatsen met knop naar rechts"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
@@ -3260,13 +3289,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<left parent>"
-msgstr "<linkse ouder>"
+msgstr "<linker ouder>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<right parent>"
-msgstr "<rechtse ouder>"
+msgstr "<rechter ouder>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<colon>"
-msgstr "<dubbelpunt>"
+msgstr "<dubbele punt>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
@@ -3284,5 +3313,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:53
 msgid "<end-of-file>"
-msgstr "<bestandseinde>"
+msgstr "<einde-van-bestand>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
@@ -3299,5 +3328,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "Filter string:"
-msgstr "Filterregel"
+msgstr "Filtertekst:"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
@@ -3307,5 +3336,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165
 msgid "Enter the search expression"
-msgstr "Geef de zoekterm"
+msgstr "Voer de zoekterm in"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:174
@@ -3323,13 +3352,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "find in selection"
-msgstr "zoek in selectie"
+msgstr "Zoek in selectie"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "case sensitive"
-msgstr "hoofdlettergevoelig"
+msgstr "Hoofdlettergevoelig"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "all objects"
-msgstr "alle objecten"
+msgstr "Alle objecten"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
@@ -3387,4 +3416,6 @@
 "<b>relation</b>)"
 msgstr ""
+"<b>type:</b>... - objecten met overeenkomende type (<b>node</b>, <b>way</b>, "
+"<b>relation</b>)"
 
 #. I18n: don't translate the bold text keyword
@@ -3401,5 +3432,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b>id:</b>... - objecten met opgegeven ID (0 voor nieuwe objecten)"
 
 #. I18n: don't translate the bold text keyword
@@ -3409,4 +3440,6 @@
 "assigned version)"
 msgstr ""
+"<b>version:</b>... - objecten met opgegeven versie (0 objecten zonder een "
+"toegewezen versie)"
 
 #. I18n: don't translate the bold text keyword
@@ -3416,4 +3449,6 @@
 "assigned changeset)"
 msgstr ""
+"<b>changeset:</b>... - objecten met opgegeven ID voor wijzigingenset (0 "
+"objecten zonder toegewezen wijzigingenset)"
 
 #. I18n: don't translate the bold text keyword
@@ -3423,4 +3458,6 @@
 "<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
 msgstr ""
+"<b>nodes:</b>... - objecten met opegeven aantal knopen (<b>nodes:</b>aantal, "
+"<b>nodes:</b>min-max, <b>nodes:</b>min- of <b>nodes:</b>-max)"
 
 #. I18n: don't translate the bold text keyword
@@ -3430,9 +3467,11 @@
 "<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
 msgstr ""
+"<b>tags:</b>... - objecten met opgegeven aantal tags (<b>tags:</b>aantal, "
+"<b>tags:</b>min-max, <b>tags:</b>min- of <b>tags:</b>-max)"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
 msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
+msgstr "<b>role:</b>... - objecten met opgegeven rol in een relatie"
 
 #. I18n: don't translate the bold text keyword
@@ -3442,4 +3481,6 @@
 "2009-11-12 or T14:51 ...)"
 msgstr ""
+"<b>timestamp:</b>... - objecten met tijdstempel (2009-11-12T14:51:09Z, "
+"2009-11-12 of T14:51 ...)"
 
 #. I18n: don't translate the bold text keyword
@@ -3449,4 +3490,6 @@
 "max or <b>areasize:</b>max)"
 msgstr ""
+"<b>areasize:</b>... - gesloten wegen met opgegeven gebied in m² (<b>areasize:"
+"</b>min-max of <b>areasize:</b>max)"
 
 #. I18n: don't translate the bold text keyword
@@ -3468,5 +3511,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:227
 msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>ongetagd</b> - alle objecten zonder tag"
+msgstr "<b>untagged</b> - alle objecten zonder tag"
 
 #. I18n: don't translate the bold text keyword
@@ -3474,6 +3517,6 @@
 msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
 msgstr ""
-"<b>gesloten</b> - alle gesloten wegen (een knooppunt wordt niet als gesloten "
-"weg beschouwd)"
+"<b>closed</b> - alle gesloten wegen (een knoop wordt niet als gesloten weg "
+"beschouwd)"
 
 #. I18n: don't translate the bold text keyword
@@ -3499,4 +3542,6 @@
 "members) in downloaded area"
 msgstr ""
+"<b>(all)indownloadedarea</b> - objecten (en al diens wegknopen / leden van "
+"relaties) in gedownload gebied"
 
 #. I18n: don't translate the bold text keyword
@@ -3506,9 +3551,11 @@
 "current view"
 msgstr ""
+"<b>(all)inview</b> - objecten (en alle wegknopen / leden van relaties "
+"daarvan) in huidige weergave"
 
 #. I18n: don't translate the bold text keyword
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OR"
+msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OF"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
@@ -3523,6 +3570,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"Tussen aanhalingstekens moet er voor <b>\"</b>- en <b>\\</b>-karakters een "
-"<b>\\</b> gezet worden. (bijv. <b>\\\"</b> en <b>\\\\</b>)."
+"Tussen aanhalingstekens moet vóór de tekens <b>\"</b>- en <b>\\</b> een <b>"
+"\\</b> gezet worden. (bijv. <b>\\\"</b> en <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
@@ -3539,8 +3586,8 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
 msgid "Filter"
-msgstr "Filter"
+msgstr "Filteren"
 
 #: ../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 "Zoeken"
@@ -3560,5 +3607,8 @@
 "\n"
 " {0}"
-msgstr "Zoekexpressie is niet geldig: {0}"
+msgstr ""
+"Zoekexpressie is niet geldig: \n"
+"\n"
+" {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
@@ -3613,5 +3663,5 @@
 msgctxt "search"
 msgid "A"
-msgstr "A (alle)"
+msgstr "T"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:53
@@ -3622,5 +3672,5 @@
 "{2}"
 msgstr ""
-"De regexp \"{0}\" bevat een ontleedfout op positie {1}, complete "
+"De regexp \"{0}\" bevat een fout bij het ontleden op positie {1}, volledige "
 "foutmelding:\n"
 "\n"
@@ -3634,5 +3684,5 @@
 "{1}"
 msgstr ""
-"The regex \"{0}\" bevat een syntactische fout, volledige foutmelding:\n"
+"De regex \"{0}\" bevat een fout bij het ontleden, volledige foutmelding:\n"
 "\n"
 "{1}"
@@ -3641,6 +3691,6 @@
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
-"Sleutel kan niet leeg zijn wanneer de tag-operator wordt gebruikt. Voorbeeld "
-"van gebruik: sleutel=waarde."
+"Sleutel mag niet leeg zijn als de tag-operator wordt gebruikt.  Voorbeeld "
+"van gebruik: sleutel=waarde"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:476
@@ -3680,5 +3730,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:865
 msgid "Changeset id expected"
-msgstr "ID van veranderingsset werd verwacht"
+msgstr "ID van wijzigingenset werd verwacht"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:867
@@ -3691,6 +3741,6 @@
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
-"Waarschuwing: automatisch afkappen van waarde van tag \"{0}\" van verwijderd "
-"objekt {1}"
+"Waarschuwing: automatisch afbreken van waarde van tag \"{0}\" van verwijderd "
+"object {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:68
@@ -3705,10 +3755,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:71
 msgid "Precondition Violation"
-msgstr "Voorconditie werd geschonden"
+msgstr "Voorwaarde werd geschonden"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:83
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} knopen in weg {1} overschrijdt het maximum aantal knopen {2}"
+msgstr ""
+"{0} knopen in weg {1} overschrijden het maximum toegestane aantal knopen {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:88
@@ -3718,5 +3769,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
 msgid "Cyclic dependency between relations:"
-msgstr "Wederzijdse afhankelijkheid tussen relaties:"
+msgstr "Cirkelverwijzing tussen relaties:"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
@@ -3727,7 +3778,7 @@
 "dependency.</html>"
 msgstr ""
-"<html>{0} relaties maken een circel omdat ze naar elkaar verwijzen.<br>JOSM "
-"kan ze niet versturen.  Graag de relaties aanpassen door de wederzijdse "
-"afhankelijkheid te verwijderen.</html>"
+"<html>{0} relaties maken een cirkelverwijzing omdat ze naar elkaar verwijzen."
+"<br>JOSM kan ze niet uploaden. Bewerk de relaties en verwijder de "
+"cirkelverwijzing.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -3741,5 +3792,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
 msgid "Cycling dependencies"
-msgstr "Fietsen afhankelijkheden"
+msgstr "Cirkelverwijzingen"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:114
@@ -3750,8 +3801,8 @@
 "inspect them."
 msgstr ""
-"Het volgende is het resultaat van de automatische validatie. Probeer het op "
-"te lossen, maar wees voorzichtig (verwijder geen geldige data). Negeer het "
-"probleem bij twijfel.<br>Als u deze diaoog annuleert, vindt u de "
-"aanwijzingen voor inspectie in het validatie-zijpaneel."
+"Het volgende zijn de resultaten van het automatische valideren.  Probeer "
+"deze op te lossen, maar wees voorzichtig (beschadig geen geldige gegevens). "
+"Negeer ze als u twijfelt.<br>Als u dit dialoogvenster annuleert, vindt u de "
+"items in het venster voor valideren aan de zijkant om ze te inspecteren."
 
 #. * Error messages
@@ -3775,5 +3826,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:125
 msgid "Fix these when possible."
-msgstr "Los op waar mogelijk."
+msgstr "Los deze op indien mogelijk."
 
 #. * Other messages
@@ -3783,5 +3834,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 "Andere"
@@ -3789,9 +3840,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:128
 msgid "Informational warnings, expect many false entries."
-msgstr "Informatieve waarschuwingen, verwacht veel fout-positieven."
+msgstr "Informatieve waarschuwingen, verwacht veel valse positieven."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
 msgid "Suspicious data found. Upload anyway?"
-msgstr "verdacht gegevens gevonden. Toch uploaden?"
+msgstr "Verdachte gegevens gevonden. Toch uploaden?"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3802,5 +3853,5 @@
 #, java-format
 msgid "Add node {0}"
-msgstr "Knooppunt {0} toevoegen"
+msgstr "Knoop {0} toevoegen"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -3824,25 +3875,25 @@
 #, java-format
 msgid "Change node {0}"
-msgstr "Knooppunt {0} veranderen"
+msgstr "Knoop {0} wijzigen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:56
 #, java-format
 msgid "Change way {0}"
-msgstr "Weg {0} veranderen"
+msgstr "Weg {0} wijzigen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
 #, java-format
 msgid "Change relation {0}"
-msgstr "Relatie {0} veranderen"
+msgstr "Relatie {0} wijzigen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:49
 #, java-format
 msgid "Changed nodes of {0}"
-msgstr "Knooppunten van {0} werden gewijzigd"
+msgstr "{0} knopen werden gewijzigd"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "Verwijder \"{0}\" voor knooppunt \"{1}\""
+msgstr "Verwijder \"{0}\" voor knoop \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
@@ -3859,15 +3910,15 @@
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr "Zet {0}={1} voor knooppunt ''{2}''"
+msgstr "Stel {0}={1} in voor knoop ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr "Zet {0}={1} voor weg ''{2}''"
+msgstr "Stel {0}={1} in voor weg ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr "Zet {0}={1} voor relatie ''{2}''"
+msgstr "Stel {0}={1} in voor relatie ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -3879,10 +3930,10 @@
 #, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Zet {0}={1} voor {2} objecten"
+msgstr "Stel {0}={1} in voor {2} objecten"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
 #, java-format
 msgid "Change relation member role for {0} {1}"
-msgstr "Verander rol van relatielid voor {0} {1}"
+msgstr "Rol rol van lid van relatie voor {0} {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30
@@ -3907,6 +3958,6 @@
 "object ''{1}''."
 msgstr ""
-"Opgelet: Laag ''{0}'' bestaat niet meer. Het conflict voor object ''{1}'' "
-"kan niet worden verwijderd."
+"Waarschuwing: Laag ''{0}'' bestaat niet meer. Kan het conflict voor object "
+"''{1}'' niet verwijderen."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67
@@ -3921,5 +3972,5 @@
 "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
-"Kan commando \"{0}\" niet terugdraaien omdat laag  \"{1}\" niet meer "
+"Kan opdracht \"{0}\" niet ongedaan maken omdat laag  \"{1}\" niet meer "
 "aanwezig is"
 
@@ -3933,41 +3984,41 @@
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:74
 msgid "Cannot resolve undecided conflict."
-msgstr "Kan onbeslist konflikt niet oplossen."
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
+msgstr "Kan onbeslist conflict niet oplossen."
+
+#: ../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 "Ten minste een te verwijderen object nodig, kreeg lege verzameling"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+msgstr "Ten minste één te verwijderen object vereist, kreeg lege verzameling"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
 #, java-format
 msgid "Delete node {0}"
-msgstr "Knooppunt {0} wissen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+msgstr "Verwijder knoop {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:151
 #, java-format
 msgid "Delete way {0}"
-msgstr "Weg {0} wissen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+msgstr "Verwijder  weg {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152
 #, java-format
 msgid "Delete relation {0}"
-msgstr "Relatie {0} wissen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+msgstr "Verwijder  relatie {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
 #, java-format
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] "Verwijder {0} object"
+msgstr[0] "Verwijder object {0}"
 msgstr[1] "Verwijder {0} objecten"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] "Verwijder {0} knooppunt"
-msgstr[1] "Verwijder {0} knooppunten"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+msgstr[0] "Verwijder {0} knoop"
+msgstr[1] "Verwijder {0} knopen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171
 #, java-format
 msgid "Delete {0} way"
@@ -3976,5 +4027,5 @@
 msgstr[1] "Verwijder {0} wegen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} relation"
@@ -3983,13 +4034,15 @@
 msgstr[1] "Verwijder {0} relaties"
 
-#: ../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}\" gewist"
-
-#. 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
+msgstr "\"{0}\" verwijderd"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:430
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488
+msgid "Delete confirmation"
+msgstr "Bevestig verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:431
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3997,45 +4050,35 @@
 "might use them.<br>Do you really want to delete?"
 msgstr ""
-"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
-"gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die je "
-"niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
-
-#: ../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 "Bevestig verwijderen"
-
-#. leave message in one tr() as there is a grammatical
-#. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+"U staat op het punt knopen te verwijderen buiten het gebied dat u hebt "
+"gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die u "
+"niet ziet) ze zouden kunnen gebruiken.<br>Wilt u ze echt verwijderen?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
 "because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
-"Je gaat objecten verwijderen die niet helemaal afgehaald zijn.<br>Dit zal "
-"problemen veroorzaken aangezien je niet het echte object ziet.<br>Ben je "
-"zeker dat je wil doorgaan?"
+"U gaat incomplete objecten verwijderen.<br>Dit zal problemen veroorzaken "
+"aangezien u niet het echte object ziet.<br>Wilt u ze echt verwijderen?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Conflicten in verwijderde toestand oplossen in {0}"
+msgstr "Conflicten in verwijderde status oplossen in {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:38
 #, java-format
 msgid "Set the ''modified'' flag for node {0}"
-msgstr "Zet de \"gewijzigd\"-vlag voor knooppunt {0}"
+msgstr "Stel de vlag \"gewijzigd\" in voor knoop {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:39
 #, java-format
 msgid "Set the ''modified'' flag for way {0}"
-msgstr "Zet de \"gewijzigd\"-vlag voor weg {0}"
+msgstr "Stel de vlag \"gewijzigd\" in voor weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:40
 #, java-format
 msgid "Set the ''modified'' flag for relation {0}"
-msgstr "Zet de \"gewijzigd\"-vlag voor relatie {0}"
+msgstr "Stel de vlag \"gewijzigd\" in voor relatie {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:134
@@ -4043,6 +4086,6 @@
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Verplaats {0} knooppunt"
-msgstr[1] "Verplaats {0} knooppunten"
+msgstr[0] "Verplaats {0} knoop"
+msgstr[1] "Verplaats {0} knopen"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:255
@@ -4050,10 +4093,6 @@
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] ""
-"{0} object uit lokaal osm-bestand verwijderd, zonder dat dit op de server "
-"verwijderd zal worden"
-msgstr[1] ""
-"{0} objecten uit lokaal osm-bestand verwijderd, zonder dat deze op de server "
-"verwijderd zal worden"
+msgstr[0] "{0} object afgevoerd"
+msgstr[1] "{0} objecten afgevoerd"
 
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:50
@@ -4066,6 +4105,6 @@
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Roteer {0} knooppunt"
-msgstr[1] "Roteer {0} knooppunten"
+msgstr[0] "Roteer {0} knoop"
+msgstr[1] "Roteer {0} knopen"
 
 #: ../core/src/org/openstreetmap/josm/command/ScaleCommand.java:84
@@ -4073,6 +4112,6 @@
 msgid "Scale {0} node"
 msgid_plural "Scale {0} nodes"
-msgstr[0] "Schaal {0} knooppunt"
-msgstr[1] "Schaal {0} knooppunten"
+msgstr[0] "Schaal {0} knoop"
+msgstr[1] "Schaal {0} knopen"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:90
@@ -4083,5 +4122,5 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "Los {0} tagconflicten op voor knooppunt {1}"
+msgstr "Los {0} tagconflicten op voor knoop {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:61
@@ -4099,6 +4138,6 @@
 msgid "Transform {0} node"
 msgid_plural "Transform {0} nodes"
-msgstr[0] "Transformeer {0} knooppunt"
-msgstr[1] "Transformeer {0} knooppunten"
+msgstr[0] "Transformeer {0} knoop"
+msgstr[1] "Transformeer {0} knopen"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:63
@@ -4112,5 +4151,5 @@
 #, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Los versieconflicten op voor knooppunt {0}"
+msgstr "Los versieconflicten op voor knoop {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:39
@@ -4127,10 +4166,10 @@
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr "Los conflicten op in knooppuntenlijst van weg {0}"
+msgstr "Los conflicten op in de lijst met knopen van weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:62
 #, java-format
 msgid "Main dataset does not include node {0}"
-msgstr "Er is geen knooppunt {0} in de hoofddataset"
+msgstr "Er is geen knoop {0} in de hoofdgegevensset"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -4143,5 +4182,5 @@
 "its nodes are suggested in order to maintain data consistency."
 msgstr ""
-"Bij het omkeren van de rijrichting worden de volgende veranderingen van "
+"Bij het omkeren van de rijrichting worden de volgende wijzigingen in "
 "eigenschappen van de weg en zijn knopen voorgesteld om de gegevens "
 "consistent te houden."
@@ -4185,5 +4224,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:74
 msgid "Please select which property changes you want to apply."
-msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen."
+msgstr "Selecteer welke wijzigingen in eigenschappen u wilt toepassen."
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:86
@@ -4203,5 +4242,7 @@
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr "Folder {0} kan niet aangemaakt worden, autosave wordt uitgeschakeld"
+msgstr ""
+"Map {0} kan niet aangemaakt worden, automatisch opslaan zal worden "
+"uitgeschakeld"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:148
@@ -4209,6 +4250,6 @@
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
-"Het bestand {0} kan niet aangemaakt worden, er wordt een andere bestandsnaam "
-"gebruikt"
+"Het bestand {0} kan niet aangemaakt worden, er zal een andere bestandsnaam "
+"worden gebruikt"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:153
@@ -4216,16 +4257,16 @@
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
-"Invoer/Uitvoerfout bij het aanmaken van bestand, autosave wordt niet "
-"uitgevoerd: {0}"
+"Fout voor Invoer/Uitvoer bij het aanmaken van bestand, automatisch opslaan "
+"wordt overgeslagen: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:175
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Het voormalige backupbestand {0} kan niet worden verwijderd"
+msgstr "Het voormalige back-upbestand {0} kan niet worden verwijderd"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:238
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Fout bij het aanmaken van een backup van de verwijderde laag; {0}"
+msgstr "Fout bij het aanmaken van een back-up van de verwijderde laag; {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:268
@@ -4236,25 +4277,26 @@
 #: ../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}''"
-msgstr "Deze waarde wordt niet ondersteund voor breedtegraad ''{0}''"
+msgstr "Ongeldige waarde ''{0}'' voor breedtegraad"
 
 #: ../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 "Deze waarde wordt niet ondersteund voor lengtegraad ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:336
+msgstr "Ongeldige waarde ''{0}'' voor lengtegraad"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:337
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
-"Opgelet: het was niet mogelijk om de instellingen op te slaan op ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:459
+msgstr "Waarschuwing: Niet mogelijk om de voorkeuren te behouden voor ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Configuratiebestand is verminkt in regels {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472
 #, java-format
 msgid ""
@@ -4262,8 +4304,8 @@
 "not a directory."
 msgstr ""
-"Waarschuwing: het was niet mogelijk om de instellingen te intialiseren. "
-"Folder ''{0}'' is geen bestaande folder."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+"Waarschuwing: Niet mogelijk om de voorkeuren te initialiseren. Map voor "
+"voorkeuren ''{0}'' is geen map."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475
 #, java-format
 msgid ""
@@ -4271,8 +4313,8 @@
 "not a directory.</html>"
 msgstr ""
-"<html>Het was niet mogelijk om de instellingen te intialiseren.<br>Folder "
-"''{0}'' is geen bestaande folder.</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482
+"<html>Niet mogelijk om de voorkeuren te initialiseren.<br>Map voor "
+"voorkeuren ''{0}'' is geen map.</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483
 #, java-format
 msgid ""
@@ -4280,8 +4322,8 @@
 "preference directory: {0}"
 msgstr ""
-"Waarschuwing: het was niet mogelijk om de instellingen te intialiseren. "
-"Folder ''{0}'' kon niet worden aangemaakt."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485
+"Waarschuwing: Niet mogelijk om de voorkeuren te initialiseren. Niet mogelijk "
+"om de ontbrekende map voor voorkeuren: {0} te maken"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
 msgid ""
@@ -4289,16 +4331,16 @@
 "preference directory: {0}</html>"
 msgstr ""
-"<html>Het was niet mogelijk om de instellingen te intialiseren<br> Folder "
-"''{0}'' kon niet worden aangemaakt.</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496
+"<html>Het was niet mogelijk om de voorkeuren te initialiseren<br>Niet "
+"mogelijk om de ontbrekende map voor voorkeuren: {0} te maken.</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497
 #, java-format
 msgid ""
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
-"Waarschuwing: Voorkeurenbestand \"{0}\" ontbreekt. Er wordt "
-"voorkeurenbestand wordt aangemaakt met standaardinstellingen."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+"Waarschuwing: Bestand voor voorkeuren \"{0}\" ontbreekt. Er wordt standaard "
+"bestand voor voorkeuren aangemaakt."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -4306,8 +4348,8 @@
 "file."
 msgstr ""
-"Waarschuwing: Het bestaande voorkeurenbestand \"{0}\" zal worden vervangen "
-"door een voorkeurenbestand met standaardinstellingen."
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508
+"Waarschuwing: Het bestaande bestand voor voorkeuren \"{0}\" zal worden "
+"vervangen door een standaard ebstand voor voorkeuren."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
 msgid ""
@@ -4315,9 +4357,8 @@
 "to default: {0}</html>"
 msgstr ""
-"<html>De voorkeursinstellingen konden niet worden geïnitialiseerd.<br>Het "
-"voorkeursinstellingenbestand kon niet worden ingesteld op de "
-"standaardinstellingen: {0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521
+"<html>De voorkeuren konden niet worden geïnitialiseerd.<br>Niet mogelijk om "
+"bestand met voorkeuren te herstellen naar standaard : {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522
 #, java-format
 msgid ""
@@ -4325,9 +4366,9 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
-"<html>Het voorkeursinstellingenbestand bevatte fouten.<br> Er wordt een "
-"backup hiervan weggeschreven naar <br>{0}<br> en een nieuw bestand wordt "
-"aangemaakt op basis van de standaardinstellingen.</html>"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531
+"<html>Het bestand voor voorkeuren bevatte fouten.<br> Er wordt een back-up "
+"van het oude weggeschreven naar <br>{0}<br> en een nieuw standaard bestand "
+"voor voorkeuren wordt aangemaakt.</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532
 #, java-format
 msgid ""
@@ -4338,5 +4379,5 @@
 "voorkeuren herstellen naar standaard: {0}"
 
-#: ../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}"
@@ -4355,10 +4396,10 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:126
 msgid "Could not load preferences from server."
-msgstr "Kan geen voorkeuren van server laden."
+msgstr "Kon geen voorkeuren van server laden."
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
 #, java-format
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr "resource ''{0}'' kon niet worden geladen, foutmelding is {1}."
+msgstr "Resource ''{0}'' kon niet worden geladen, fout is {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:98
@@ -4377,10 +4418,10 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Waarschuwing; het revisiebestand ''/REVISION'' ontbreekt."
+msgstr "Waarschuwing: het revisiebestand ''/REVISION'' ontbreekt."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
-msgstr "Er werd reeds een conflict geregistreerd voor primitief ''{0}''."
+msgstr "Er werd al een conflict geregistreerd voor primitief ''{0}''."
 
 #. *
@@ -4412,20 +4453,20 @@
 msgstr "Geprojecteerde coördinaten"
 
-#: ../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 "Z"
 
-#: ../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 "N"
 
-#: ../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 "W"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128
 msgctxt "compass"
 msgid "E"
@@ -4443,14 +4484,14 @@
 
 #: ../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}."
-msgstr "Een ID > 0 werd verwacht. In de plaats daarvan is ID = {0}"
+msgstr "ID > 0 verwacht. Kreeg {0}."
 
 #: ../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}."
-msgstr "Een versie > 0 werd verwacht. In de plaats daarvan is versie = {0}"
+msgstr "Versie > 0 verwacht. Kreeg {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:255
@@ -4460,6 +4501,6 @@
 "{0}"
 msgstr ""
-"Er kan geen wijzigingenset-Id > 0 aan een nieuw primitief worden toegekend. "
-"De waarde van de wijzigingenset-Id is {0}"
+"Kan geen wijzigingenset-Id > 0 aan een nieuw primitief toewijzen. De waarde "
+"van wijzigingenset-Id is {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:387
@@ -4467,13 +4508,13 @@
 msgstr "Een primitief met ID = 0 kan niet onzichtbaar zijn."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346
 #, java-format
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
 msgstr ""
-"Het was niet mogelijk om primitief {0} toe te voegen aan de dataset, omdat "
-"deze er al deel van uitmaakt"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
+"Niet mogelijk om primitief {0} toe te voegen aan de gegevensset, omdat deze "
+"er al deel van uitmaakt"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817
 #, java-format
 msgid ""
@@ -4493,5 +4534,5 @@
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr "Samenvoegdoel voor weg met id {0} ontbreekt"
+msgstr "Doel voor samenvoegen voor weg met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:182
@@ -4508,5 +4549,5 @@
 #, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr "Samenvoegdoel voor knooppunt met id {0} ontbreekt"
+msgstr "Doel voor samenvoegen voor knoop met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:262
@@ -4515,5 +4556,5 @@
 #, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr "Samenvoegdoel voor relatie met id {0} ontbreekt"
+msgstr "Doel voor samenvoegen voor relatie met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:267
@@ -4523,5 +4564,5 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr "Samenvoegdoel van type {0} met id {1} ontbreekt"
+msgstr "Doel voor samenvoegen van type {0} met id {1} ontbreekt"
 
 #. Same version, but different "visible" attribute and neither of them are modified.
@@ -4538,9 +4579,9 @@
 #, java-format
 msgid "Cannot add a way with only {0} nodes."
-msgstr "Een weg met slechts {0} knooppunten kan niet worden toegevoegd"
+msgstr "Kan geen weg toevoegen met slechts {0} knopen"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:163
 msgid "Each node must connect exactly 2 ways"
-msgstr "Elk knooppunt moet exact 2 wegen met elkaar verbinden"
+msgstr "Elke knoop moet exact 2 wegen met elkaar verbinden"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:195
@@ -4548,28 +4589,28 @@
 msgstr "Er zijn wegen die elkaar kruisen."
 
-#: ../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 "
 "other is not"
 msgstr ""
-"Deze primitieven kunnen niet worden samengevoegd, aangezien één ervan nieuw "
-"is en de andere niet"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948
+"Deze primitieven kunnen niet worden samengevoegd, omdat één ervan nieuw is "
+"en de andere niet"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952
 #, java-format
 msgid ""
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
-"Primitieven met verschillende IDs kunnen niet worden samengevoegd. Het "
-"betreft ID {0} en ID {1}"
+"Primitieven met verschillende ID''s kunnen niet worden samengevoegd. Deze ID "
+"is {0}, de andere is {1}"
 
 #. ICON(data/)
 #: ../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"
-msgstr[0] "knooppunt"
-msgstr[1] "knooppunten"
+msgstr[0] "knoop"
+msgstr[1] "knopen"
 
 #. ICON(data/)
@@ -4588,6 +4629,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"
@@ -4599,5 +4640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:18
 msgid "closedway"
-msgstr "geslotenveelhoek"
+msgstr "geslotenweg"
 
 #. ICON(data/)
@@ -4615,5 +4656,5 @@
 msgstr ""
 "Deze groep tags kan niet worden toegepast op een primitief aangezien er "
-"sleutel zijn met meerdere waardes."
+"sleutels zijn met meerdere waarden."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:356
@@ -4621,6 +4662,5 @@
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
-"Knooppunt {0} kan niet aan onvolledig afgehaalde weg {1} worden toegevoegd."
+msgstr "Knoop {0} kan niet aan incomplete weg {1} worden toegevoegd."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:135
@@ -4634,5 +4674,5 @@
 #, java-format
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr "Parameter {0} met als waarde ''{2}'' valt niet in het bereik 0..{1}."
+msgstr "Parameter {0} niet in bereik 0..{1}. Kreeg ''{2}''."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:108
@@ -4641,5 +4681,5 @@
 "Error: failed to load map renderer class ''{0}''. The class wasn''t found."
 msgstr ""
-"Fout: Kan kaartweergaveklasse \"{0}\" niet laden. De klasse kan niet worden "
+"Fout: Kan kaartweergaveklasse \"{0}\" niet laden.  De klasse werd niet "
 "gevonden."
 
@@ -4650,5 +4690,5 @@
 msgstr ""
 "Kaartweergaveklasse \"{0}\" kan niet geactiveerd worden omdat de klasse niet "
-"kan worden gevonden."
+"werd gevonden."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:144
@@ -4656,5 +4696,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:154
 msgid "Activating the standard map renderer instead."
-msgstr "De standaard kaarttekenaar wordt in diens plaats geactiveerd."
+msgstr "De standaard kaarttekenaar wordt in plaats hiervan geactiveerd."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:147
@@ -4665,5 +4705,5 @@
 msgstr ""
 "Kaartweergaveklasse \"{0}\" kan niet geactiveerd worden omdat het een "
-"subklasse van \"{1}\" is."
+"subklasse is van \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:153
@@ -4690,5 +4730,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:171
 msgid "Renders the map using style rules in a set of style sheets."
-msgstr "Tekent de kaart met behulp van stijlregels in een stijlbladenset."
+msgstr "Tekent de kaart met behulp van stijlregels in een set stijlbladen."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -4708,13 +4748,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 msgid "Node: standard"
-msgstr "Knooppunt: standaard"
+msgstr "Knoop: standaard"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
 msgid "Node: connection"
-msgstr "Knooppunt: verbinding"
+msgstr "Knoop: verbinding"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 msgid "Node: tagged"
-msgstr "Knooppunt: met tag"
+msgstr "Knoop: met tag"
 
 #. teal
@@ -4741,5 +4781,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:30
 msgid "untagged"
-msgstr "niet-getagd"
+msgstr "ongetagd"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:31
@@ -4749,5 +4789,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:32
 msgid "areatext"
-msgstr "Tekst voor gebied"
+msgstr "tekst voor gebied"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg3008.java:29
@@ -4757,11 +4797,10 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
 msgid "WGS84 Geographic"
-msgstr "WGS84 Geographisch"
+msgstr "WGS84 Geografisch"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:48
 #, java-format
 msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Fout: mislukt om een invoerstroom te openen voor de bron ''/data/{0}''."
+msgstr "Fout: kon geen invoerstroom openen voor ''/data/{0}''."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
@@ -4779,6 +4818,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
-"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
-"NTF<->RGF93 grid"
+"Fout: kon geen invoerstroom openen voor ''/data/{0}''. Kan raster NTF<-"
+">RGF93 niet laden"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
@@ -4828,5 +4867,5 @@
 #, java-format
 msgid "Cannot instantiate projection ''{0}''"
-msgstr "Projectie {0} kan niet geïnstantieerd worden"
+msgstr "Projectie {0} kan niet ingesteld worden"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/ProjectionInfo.java:41
@@ -4836,6 +4875,6 @@
 "''{2}''."
 msgstr ""
-"Projectiecode ''{0}'' kan niet in overeenstemming gebracht worden toCode() "
-"heeft ''{1}'' als resultaat, terwijl er ''{2}'' verwacht werd."
+"Code voor projectie niet in overeenstemming met ''{0}'': toCode() geeft "
+"''{1}'' als resultaat, terwijl ''{2}'' verwacht werd."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/ProjectionInfo.java:50
@@ -4845,5 +4884,5 @@
 "match code ''{1}''."
 msgstr ""
-"Slechte implementatie van ''{0}''-projectieklasse: voorkeuren kunnen niet "
+"Slechte implementatie van projectieklasse ''{0}'': voorkeuren kunnen niet "
 "worden ingesteld in overeenstemming met code ''{1}''."
 
@@ -4854,5 +4893,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:92
 msgid "PUWG Zone"
-msgstr "PUWG Zone"
+msgstr "PUWG-zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:171
@@ -4863,5 +4902,5 @@
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr "PUWG 2000 Zone {0} (Polen)"
+msgstr "PUWG 2000-zone {0} (Polen)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:46
@@ -4871,5 +4910,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:71
 msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr ""
+msgstr "<i>CH1903 / LV03 (zonder lokalr correcties)</i>"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
@@ -4883,5 +4922,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:131
 msgid "UTM Zone"
-msgstr "UTM Zone"
+msgstr "UTM-zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:150
@@ -4900,5 +4939,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:166
 msgid "Offset 3.000.000m east"
-msgstr "Offset 3.000.000m oostelijk"
+msgstr "Verschuiving 3.000.000m oostelijk"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:30
@@ -4916,5 +4955,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:33
 msgid "Reunion RGR92"
-msgstr "Réunion RGR92"
+msgstr "Rëunion RGR92"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:34
@@ -4944,5 +4983,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
 msgid "Swiss Oblique Mercator"
-msgstr "Swiss Oblique Mercator"
+msgstr "Zwitsers Oblique Mercator"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
@@ -4950,5 +4989,5 @@
 msgstr "Transverse Mercator"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
+#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:271
 #, java-format
 msgid ""
@@ -4956,5 +4995,5 @@
 " {1}"
 msgstr ""
-"Initialiseren test {0} is mislukt:\n"
+"Fout bij initialiseren test {0}:\n"
 " {1}"
 
@@ -4962,15 +5001,15 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
 msgid "validation error"
-msgstr "validatiefout"
+msgstr "fout bij valideren"
 
 #. ICON(data/)
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:16
 msgid "validation warning"
-msgstr "Validatiewaarschuwing"
+msgstr "waarschuwing bij valideren"
 
 #. ICON(data/)
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
 msgid "validation other"
-msgstr "Validatie andere"
+msgstr "andere bij valideren"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Test.java:100
@@ -4978,4 +5017,9 @@
 msgid "Running test {0}"
 msgstr "Uitvoeren 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 ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/ChangePropertyKeyCommand.java:74
@@ -5021,9 +5065,9 @@
 msgstr ""
 "Deze test kijkt na of 2 (spoor/water)wegen of gebouwen elkaar kruisen in "
-"dezelfde laag, zonder dat er een knooppunt ze verbindt."
+"dezelfde laag, zonder dat een knoop ze verbindt."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:120
 msgid "Crossing buildings"
-msgstr "Overlappende gebouwen"
+msgstr "Kruisende gebouwen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:120
@@ -5031,74 +5075,101 @@
 msgstr "Kruisende wegen"
 
-#: ../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 "Verdubbelde knooppunten"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109
+msgstr "Gedupliceerde knopen."
+
+#: ../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 ""
-"Deze test controleert of er geen knopen met precies dezelfde locatie zijn."
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:196
+"Deze test controleert of er geen knopen op precies dezelfde locatie zijn."
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197
 msgid "Duplicate nodes in two un-closed ways"
-msgstr "Dubbele knooppunten in twee niet-gesloten wegen"
-
-#: ../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
+msgstr "Gedupliceerde knopen in twee niet-gesloten wegen"
+
+#: ../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 "Dubbele knopen"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:207
+msgstr "Gedupliceerde knopen"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208
 msgid "Mixed type duplicated nodes"
-msgstr "Gedupliceerde knooppunten van verschillend type"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:218
+msgstr "Gedupliceerde knopen van gemengd type"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:219
 msgid "Highway duplicated nodes"
-msgstr "Gedupliceerde knooppunten in weg"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:229
+msgstr "Gedupliceerde knopen in weg"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:230
 msgid "Railway duplicated nodes"
-msgstr "Gedupliceerde knooppunten in spoorweg"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:240
+msgstr "Gedupliceerde knopen in spoorweg"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:241
 msgid "Waterway duplicated nodes"
-msgstr "Gedupliceerde knooppunten in waterweg"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:251
+msgstr "Gedupliceerde knopen in waterweg"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:252
 msgid "Boundary duplicated nodes"
-msgstr "Gedupliceerde knooppunten in grens"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:262
+msgstr "Gedupliceerde knopen in grens"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:263
 msgid "Power duplicated nodes"
-msgstr "Gedupliceerde knooppunten in hoogspanningsleiding"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:273
+msgstr "Gedupliceerde knopen in hoogspanningsleiding"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:274
 msgid "Natural duplicated nodes"
-msgstr "Gedupliceerde knooppunten in natuur (bos, water)"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:284
+msgstr "Gedupliceerde knopen in natuur (bos, water)"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:285
 msgid "Building duplicated nodes"
-msgstr "Gedupliceerde knooppunten in gebouw"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:295
+msgstr "Gedupliceerde knopen in gebouw"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:296
 msgid "Landuse duplicated nodes"
-msgstr "Gedupliceerde knooppunten in grondgebruik"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:306
+msgstr "Gedupliceerde knopen in grondgebruik"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:307
 msgid "Other duplicated nodes"
-msgstr "Andere gedupliceerde knooppunten"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:334
+msgstr "Andere gedupliceerde knopen"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:335
 msgid "Nodes at same position"
-msgstr "Knooppunten op exact dezelfde positie"
+msgstr "Knopen op dezelfde positie"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
@@ -5111,22 +5182,22 @@
 "with same roles."
 msgstr ""
-"Deze test controleert dat er geen relaties zijn met dezelfde tags en leden "
-"met dezelfde rollen."
+"Deze test controleert dat er geen relaties zijn met dezelfde tags en "
+"dezelfde leden met dezelfde rollen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:159
 msgid "Duplicated relations"
-msgstr "Verdubbelde relaties"
+msgstr "Gedupliceerde relaties"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:168
 msgid "Relations with same members"
-msgstr "Relatie met dubbele leden"
+msgstr "Relatie met dezelfde leden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:251
 msgid "Delete duplicate relations"
-msgstr "Dubbele relaties verwijderen"
+msgstr "Gedupliceerde relaties verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:88
 msgid "Duplicated ways."
-msgstr "Verdubbelde wegen"
+msgstr "Gedupliceerde wegen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:89
@@ -5135,10 +5206,10 @@
 "optionally also same tags."
 msgstr ""
-"Deze test controleert dat er geen wegen zijn met dezelfde "
-"knooppuntcoördinaten en mogelijk ook dezelfde tags."
+"Deze test controleert dat er geen wegen zijn met dezelfde coördinaten voor "
+"de knoop en optioneel ook dezelfde tags."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:105
 msgid "Duplicated ways"
-msgstr "Gedupliceerde wegen op dezelfde positie"
+msgstr "Gedupliceerde wegen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:130
@@ -5152,67 +5223,66 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java:23
 msgid "Duplicated way nodes."
-msgstr "Dubbele wegknopen."
+msgstr "Gedupliceerde wegknopen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java:24
 msgid "Checks for ways with identical consecutive nodes."
-msgstr "Op wegen met identieke, opeenvolgende knopen controleren."
+msgstr "Controleert op wegen met identieke, opeenvolgende knopen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java:38
 msgid "Duplicated way nodes"
-msgstr "Dubbele wegknopen"
+msgstr "Gedupliceerde wegknopen"
 
 #. 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 "Multipolygoon"
 
-#: ../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 "Deze test kijkt na of multipolygons geldig zijn"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121
+msgstr "Deze test kijkt na of multipolygonen geldig zijn"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:122
 msgid "Area style way is not closed"
 msgstr "Gebied is niet gesloten"
 
-#: ../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 "Multipolygoonrelatie ontbreekt een lid met als rol outer"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:182
+msgstr "Geen buitenste weg voor multipolygoon"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:183
 msgid "No style for multipolygon"
-msgstr "Multipolygoonrelatie ontbreekt stijlinformatie"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:184
+msgstr "Geen stijlinformatie voor multipolygoon"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:185
 msgid "No style in multipolygon relation"
-msgstr "Multipolygoonrelatie ontbreekt stijlinformatie"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
+msgstr "Geen stijlinformatie in relatie van multipolygoon"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:203
 msgid "Style for inner way equals multipolygon"
-msgstr ""
-"De stijl voor één van de wegen met als rol inner is gelijk aan multipolygon"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
+msgstr "Stijl voor binnenste weg is gelijk aan multipolygoon"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:220
 msgid "Style for outer way mismatches"
-msgstr "De stijl voor de weg met als rol outer, komt niet overeen"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:228
+msgstr "De stijl voor buitenste weg komt niet overeen"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:238
 msgid "Multipolygon is not closed"
 msgstr "Multipolygoon is niet gesloten"
 
-#: ../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 ""
 "Het lid van de multipolygoonrelatie met als rol inner ligt aan de buitenkant"
 
-#: ../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 "Wegen die lid zijn van een multipolygoonrelatie kruisen elkaar"
 
-#: ../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 "Een lid van een multipolygoonrelatie heeft een niet-geschikte rol"
 
-#: ../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 "Multipolygoonrelatie bevat een lid dat geen ''weg'' is"
@@ -5220,5 +5290,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:36
 msgid "Missing name:* translation."
-msgstr "Er ontbreekt een name:*-vertaling"
+msgstr "Er ontbreekt een vertaling name:*"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:37
@@ -5229,14 +5299,14 @@
 msgstr ""
 "Deze test vindt meertalige objecten waarvan het attribuut ''name'' niet "
-"gelijk is aan enkele attributen ''name:*'' en niet een samenvoeging van "
-"attributen ''name:*'', bijv., Italië - Italiaans - Italia."
+"gelijk is aan enkele attributen ''name:*'' en niet een samenstelling van "
+"attributen ''name:*'', bijv., Italia - Italiaans - Italië."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:47
 msgid "A name:* translation is missing."
-msgstr "Een name:*-vertaling ontbreekt."
+msgstr "Een vertaling voor name:* ontbreekt."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:74
 msgid "A name is missing, even though name:* exists."
-msgstr "name zelf ontbreekt, terwijl er wel name:*-velden gedefinieerd zijn."
+msgstr "Een naam ontbreekt, terwijl wel name:* bestaan."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java:24
@@ -5247,5 +5317,10 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java:25
 msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr "Deze test zoekt knopen met dezelfde naam (kunnen dubbele zijn)."
+msgstr "Deze test zoekt knopen met dezelfde naam (kunnen gedupliceerde zijn)."
+
+#: ../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
@@ -5261,29 +5336,25 @@
 "wordt door meer dan één weg."
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103
-msgid "Overlapping areas"
-msgstr "Overlappende gebieden"
-
-#: ../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 "Overlappende snelwegen (met oppervlak)"
 
-#: ../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 "Spoorwegen die overlappen met een gebied"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:112
+msgstr "Overlappende spoorwegen (met gebied)"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:111
 msgid "Overlapping ways (with area)"
-msgstr "Wegen die overlappen met een gebied"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:117
+msgstr "Overlappende wegen (met gebied)"
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:116
 msgid "Overlapping highways"
 msgstr "Overlappende snelwegen"
 
-#: ../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 "Overlappende spoorwegen"
 
-#: ../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 "Overlappende wegen"
@@ -5291,5 +5362,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:40
 msgid "Relation checker :"
-msgstr "Foutenopspoorder in relaties:"
+msgstr "Controle voor relaties:"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:41
@@ -5322,5 +5393,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:175
 msgid "Role verification problem"
-msgstr "Verificatieprobleem voor rol"
+msgstr "Probleem bij verificatie van rol"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:150
@@ -5362,5 +5433,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:41
 msgid "Similarly named ways."
-msgstr "Gelijkend genaamde wegen."
+msgstr "Gelijksoortig benoemde wegen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:42
@@ -5373,9 +5444,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:85
 msgid "Similarly named ways"
-msgstr "Gelijkgenaamde wegen"
+msgstr "Soortgelijk benoemde wegen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:152
 msgid "Properties checker :"
-msgstr "Eigenschapchecker:"
+msgstr "Controle voor eigenschappen:"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:153
@@ -5387,10 +5458,10 @@
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Ongeldige regel tagchecker - {0}: {1}"
+msgstr "Ongeldige regel controle op tags - {0}: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:273
 #, java-format
 msgid "Invalid spellcheck line: {0}"
-msgstr "Ongeldige regel spellingschecker: {0}"
+msgstr "Ongeldige regel spellingscontrole: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:282
@@ -5416,9 +5487,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:423
 msgid "Tag value contains character with code less than 0x20"
-msgstr "Tagwaarde bevat karakter met een code lager dan 0x20"
+msgstr "Tagwaarde bevat teken met een code lager dan 0x20"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:428
 msgid "Tag key contains character with code less than 0x20"
-msgstr "Tagwaarde bevat karakter met een code lager dan 0x20"
+msgstr "Tagwaarde bevat teken met een code lager dan 0x20"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:433
@@ -5436,63 +5507,64 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:448
 msgid "Invalid property key"
-msgstr "Ongeldige eigenschapsleutel"
+msgstr "Ongeldige sleutel voor eigenschap"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:453
 msgid "Invalid white space in property key"
-msgstr "Ongeldige spatie in eigenschapsleutel"
+msgstr "Ongeldige spatie in sleutel voor eigenschap"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:458
 msgid "Property values start or end with white space"
-msgstr "Eigenschapwaarde begin of eindigt met een spatie"
+msgstr "Waarde voor eigenschap begint of eindigt met een spatie"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:463
 msgid "Property values contain HTML entity"
-msgstr "Eigenschapwaarden bevatten HTML-codes"
+msgstr "Waarden voor eigenschap bevatten HTML-codes"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:487
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze."
+msgstr "Sleutel \"{0}\" ontbreekt in voorkeuzen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:488
 msgid "Presets do not contain property key"
-msgstr "Voorkeuzen bevatten geen eigenschapsleutel"
+msgstr "Voorkeuzen bevatten geen sleutel voor eigenschap"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:507
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze."
+msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuzen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:508
 msgid "Presets do not contain property value"
-msgstr "Voorkeuzen bevatten geen eigenschapswaarde"
+msgstr "Voorkeuzen bevatten geen waarde voor eigenschap"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:520
 msgid "FIXMES"
-msgstr "Herstel-mij’s"
+msgstr "HERSTEL-MIJ'S"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:565
 msgid "Check property keys."
-msgstr "Eigenschapsleutels controleren."
+msgstr "Controle op sleutels van eigenschap."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:566
 msgid "Validate that property keys are valid checking against list of words."
-msgstr "Valideer eigenschapsleutels met een woordenlijst"
+msgstr "Controleer of sleutels van eigenschap geldig zijn met een woordenlijst"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:573
 msgid "Use complex property checker."
-msgstr "Uitgebreide eigenschapchecker gebruiken"
+msgstr "Uitgebreide controle van eigenschap gebruiken"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:574
 msgid "Validate property values and tags using complex rules."
 msgstr ""
-"Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen."
+"Valideer waarden van eigenschap en -tags door uitgebreide regels te "
+"gebruiken."
 
 #. JButton
 #: ../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
@@ -5510,10 +5582,10 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:632
 msgid "TagChecker source"
-msgstr "Tagcheckerbron"
+msgstr "Bron TagChecker"
 
 #: ../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
@@ -5539,5 +5611,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."
@@ -5550,6 +5622,6 @@
 msgstr ""
 "De bronnen (URL of bestandsnaam) van spellingscontrole (zie http://wiki."
-"openstreetmap.org/index.php/User:JLS/speller) of gegevensbestanden van "
-"tagchecker."
+"openstreetmap.org/index.php/User:JLS/speller) of gegevensbestanden van de "
+"controle voor tags."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:658
@@ -5571,41 +5643,42 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:683
 msgid "Check property values."
-msgstr "Eigenschapwaarden controleren."
+msgstr "Waarden voor eigenschap controleren."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:684
 msgid "Validate that property values are valid checking against presets."
-msgstr "Valideer eigenschapwaarden tegen presets"
+msgstr "Valideer waarden van eigenschap door te controleren met voorkeuzen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:691
 msgid "Check for FIXMES."
-msgstr "Controleer op herstel-mij’s."
+msgstr "Controleer op HERSTEL-MIJ'S."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:692
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr "Knopen of wegen met ''FIXME'' in de eigenschapwaarden zoeken."
+msgstr ""
+"Zoekt naar knopen of wegen met ''FIXME'' in de waarden van de eigenschap."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:699
 msgid "Use default data file."
-msgstr "Standaardgegevensbestand gebruiken."
+msgstr "Standaard gegevensbestand gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:700
 msgid "Use the default data file (recommended)."
-msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
+msgstr "Het standaard gegevensbestand gebruiken (aanbevolen)."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:703
 msgid "Use default tag ignore file."
-msgstr "Standaard tagnegeerbestand gebruiken."
+msgstr "Standaard bestand voor negeren van tags gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:704
 msgid "Use the default tag ignore file (recommended)."
-msgstr "Standaard tagnegeerbestand gebruiken (aanbevolen)."
+msgstr "Standaard bestand voor negeren van tags gebruiken (aanbevolen)."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:707
 msgid "Use default spellcheck file."
-msgstr "Standaardbestand spellingscontrole gebruiken."
+msgstr "Standaard bestand spellingscontrole gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:708
 msgid "Use the default spellcheck file (recommended)."
-msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)."
+msgstr "Het standaard bestand spellingscontrole gebruiken (aanbevolen)."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:794
@@ -5615,5 +5688,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:905
 msgid "Could not find element type"
-msgstr "Kan elementsoort niet vinden"
+msgstr "Kan elementtype niet vinden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:907
@@ -5642,5 +5715,5 @@
 msgid "This test checks if turnrestrictions are valid"
 msgstr ""
-"Deze test kijkt na of relaties die aangeven hoe er mag afgeslagen worden op "
+"Deze test kijkt na of relaties die aangeven hoe er afgeslagen mag worden op "
 "kruispunten, correct kunnen zijn"
 
@@ -5656,9 +5729,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:114
 msgid "More than one \"from\" way found"
-msgstr "Er werd meer dan 1 lid met als rol \"from\" gevonden"
+msgstr "Er werd meer dan 1 weg met \"from\" gevonden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:117
 msgid "More than one \"to\" way found"
-msgstr "Er werd meer dan 1 lid met als rol \"to\" gevonden"
+msgstr "Er werd meer dan 1 weg met \"to\" gevonden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
@@ -5668,29 +5741,25 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
 msgid "Cannot mix node and way for role \"via\""
-msgstr ""
+msgstr "Kan knoop en weg niet mixen voor rol \"via\""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:127
 msgid "No \"from\" way found"
-msgstr "Er werd geen lid met als rol \"from\" gevonden"
+msgstr "Er werd geen weg met \"from\" gevonden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:131
 msgid "No \"to\" way found"
-msgstr "Er werd geen lid met als rol \"to\" gevonden"
+msgstr "Er werd geen weg met \"to\" gevonden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:135
 msgid "No \"via\" node or way found"
-msgstr "Er werd geen lid met als rol \"via\" gevonden"
+msgstr "Er werd geen weg of knoop met \"via\" gevonden"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:145
 msgid "The \"from\" way does not start or end at a \"via\" node"
-msgstr ""
-"Het lid met als rol \"from\" start of eindigt niet bij een lid met als rol "
-"\"via\""
+msgstr "De weg met \"from\" start of eindigt niet bij een knoop met \"via\""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:147
 msgid "The \"to\" way does not start or end at a \"via\" node"
-msgstr ""
-"Het lid met als rol \"to\" start of eindigt niet bij een lid met als rol "
-"\"via\""
+msgstr "De weg met \"to\" start of eindigt niet bij een knoop met \"via\""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:151
@@ -5706,48 +5775,48 @@
 msgstr "De laatste \"via\" en de \"naar\" wegen zijn niet verbonden."
 
-#: ../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 "Niet-gesloten wegen."
 
-#: ../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 "Dit test of circulaire wegen gesloten zijn."
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:72
+msgstr "Dit test of wegen die een cirkel zouden moeten vormen gesloten zijn."
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:70
 #, java-format
 msgid "natural type {0}"
 msgstr "soort natuur {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 "soort landgebruik {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 "soort voorziening {0}"
 
-#: ../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 "soort sport {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:88
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:86
 #, java-format
 msgid "tourism type {0}"
 msgstr "soort toerisme {0}"
 
-#: ../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 "soort winkel {0}"
 
-#: ../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 "soort vermaak {0}"
 
-#: ../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}"
@@ -5795,7 +5864,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"
@@ -5807,10 +5876,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 "gebied"
 
-#: ../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 "Niet-gesloten weg"
@@ -5828,9 +5897,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:110
 msgid "Way end node near other highway"
-msgstr "Wegeindknoop dicht bij andere snelweg"
+msgstr "Eindknoop van weg dicht bij andere snelweg"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:128
 msgid "Way end node near other way"
-msgstr "Wegeindknoop dicht bij andere weg"
+msgstr "Eindknoop van weg dicht bij andere weg"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:149
@@ -5840,9 +5909,9 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java:168
 msgid "Connected way end node near other way"
-msgstr "Wegeindknoop dicht bij andere weg verbonden"
+msgstr "Verbonden eindknoop van weg dicht bij andere weg"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:39
 msgid "Untagged and unconnected nodes."
-msgstr "Tagloze en onverbonden knooppunten"
+msgstr "Tagloze en niet-verbonden knopen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:40
@@ -5862,5 +5931,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:101
 msgid "Unconnected nodes without physical tags"
-msgstr "Onverbonden knooppunten zonder fysieke tags"
+msgstr "Niet-verbonden knopen zonder fysieke tags"
 
 #. translation note: don't translate quoted words
@@ -5891,5 +5960,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java:60
 msgid "Untagged, empty and one node ways."
-msgstr "Ongetagde, lege en éénknoopswegen"
+msgstr "Ongetagde, lege en wegen met één knoop"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java:61
@@ -5907,5 +5976,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java:98
 msgid "Untagged ways (commented)"
-msgstr "ongetagde wegen (voorzien van commentaar)"
+msgstr "Ongetagde wegen (voorzien van commentaar)"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java:100
@@ -5919,5 +5988,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java:107
 msgid "One node ways"
-msgstr "Éénknoopswegen"
+msgstr "Eénknoopswegen"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:29
@@ -5927,5 +5996,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:30
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr "De test controleer de richting van water-, land of kustlijnwegen."
+msgstr "De test controleert de richting van water-, land of kustlijnwegen."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:43
@@ -5943,7 +6012,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}]"
@@ -5968,5 +6037,5 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
-"Fout: Illegale dubbele waarde''{0}'' op lijn ''{1}'' in bladwijzerbestand "
+"Fout: Ongeldige dubbele waarde''{0}'' op lijn ''{1}'' in bladwijzerbestand "
 "''{2}''"
 
@@ -5974,5 +6043,6 @@
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>Kon bladwijzers van<br>''{0}''<br>Foutmelding was: {1}</html>"
+msgstr ""
+"<html>Kon bladwijzers niet lezen van<br>''{0}''<br>Fout was: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
@@ -5981,14 +6051,15 @@
 msgstr "Niet opnieuw tonen (keuze onthouden)"
 
-#: ../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 "onvolledig"
+msgstr "incompleet"
 
 #. 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}"
@@ -5997,6 +6068,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}"
@@ -6004,12 +6075,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 "Huisnummer {0}"
 
-#: ../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 "snelweg"
@@ -6017,17 +6088,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 "spoorweg"
 
-#: ../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 "waterweg"
 
-#: ../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 "grondgebruik"
@@ -6036,8 +6107,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
@@ -6048,6 +6119,6 @@
 msgstr[1] "{0} knopen"
 
-#: ../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"
@@ -6056,9 +6127,9 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430
 msgid "public transport"
 msgstr "Openbaar vervoer"
 
-#: ../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
@@ -6068,5 +6139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:76
 msgid "Precondition violation"
-msgstr "Overtreding van preconditie"
+msgstr "Overtreding van voorwaarde"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:104
@@ -6084,5 +6155,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:157
 msgid "Illegal Data"
-msgstr "Foute gegevens"
+msgstr "Ongeldige gegevens"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
@@ -6115,5 +6186,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:294
 msgid "Client Time Out"
-msgstr "Client Time Out"
+msgstr "Client time-out"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:310
@@ -6134,5 +6205,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
-msgstr "Toon help informatie"
+msgstr "Toon Help-informatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
@@ -6142,9 +6213,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:107
 msgid "Downloading \"Message of the day\""
-msgstr "\"Dagmelding\" downloaden"
+msgstr "\"Melding van de dag\" downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:84
 msgid "Click to close the dialog"
-msgstr "Klik om de dialoog te sluiten"
+msgstr "Klik om het dialoogvenster te sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31
@@ -6161,10 +6232,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:72
 msgid "Open a blank WMS layer to load data from a file"
-msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden"
+msgstr "Open een lege WMS-laag om gegevens uit een bestand te laden"
 
 #: ../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 "Luchtfotografie"
+msgstr "Afbeeldingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:119
@@ -6177,5 +6248,5 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr "Verwachtte niet-ledige waarde voor parameter ''{0}'', bekwam ''{1}''"
+msgstr "Verwachtte niet-lege waarde voor parameter ''{0}'', kreeg ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
@@ -6192,5 +6263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid "string"
-msgstr "string"
+msgstr "tekenreeks"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -6204,5 +6275,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "De applet op de gegeven afmetingen instellen (BREEDTExHOOGTE)"
+msgstr ""
+"De applet op de gegeven afmetingen instellen (indeling: BREEDTExHOOGTE)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -6210,5 +6282,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "string;string;..."
-msgstr "string;string;..."
+msgstr "tekenreeks;tekenreeks;..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -6217,6 +6289,6 @@
 "filename"
 msgstr ""
-"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met "
-"lat=y&lon=x&zoom=z  of een bestandsnaam"
+"Alle downloaden. Kan zijn x1,y1,x2,y2, een URL die lat=y&lon=x&zoom=z bevat "
+"of een bestandsnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
@@ -6225,6 +6297,6 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Download alles als raw GPS. Mogelijkheden x1,y1,x2,y2, een URL met "
-"lat=y&lon=x&zoom=z of een bestandsnaam"
+"Download alles als ruwe GPS.  Kan zijn x1,y1,x2,y2, een URL die "
+"lat=y&lon=x&zoom=z bevat of een bestandsnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
@@ -6233,6 +6305,6 @@
 "URL which returns osm-xml"
 msgstr ""
-"Alles aan de eerste selectie toevoegen. Mogelijkheden zijn een Google-"
-"achtige zoekstring of een URL die een OSM-XML terugkrijgt"
+"Voeg alles toe aan de eerste selectie. Mogelijkheden zijn een Google-achtige "
+"zoekterm of een URL die een OSM-XML teruggeeft"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:63
@@ -6270,5 +6342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Standard unix geometry argument"
-msgstr "Standaard UNIX-geometrieargument"
+msgstr "Standaard UNIX argument voor geometrie"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
@@ -6278,20 +6350,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
+msgstr "Download de locatie in de URL (met lat=x&lon=y&zoom=z)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
-"Bestand openen (elk type bestand dat kan worden geopend met Bestand/Openen)"
+"Open een bestand (elk type bestand dat kan worden geopend met Bestand/Openen)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Download the bounding box as raw gps"
-msgstr "Het omgrensde gebied downloaden als rawe GPS"
+msgstr "Het omgrensde gebied downloaden als ruwe GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
-"Haal de locatie aan de URL (met lat=x&lon=y&zoom=z) af als onbewerkte GPS-"
-"punten"
+"Download de locatie van de URL (met lat=x&lon=y&zoom=z) als ruwe GPS-punten"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
@@ -6305,5 +6376,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "Reset the preferences to default"
-msgstr "De voorkeuren herstellen op standaardwaarden"
+msgstr "De voorkeuren herstellen naar standaardwaarden"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
@@ -6330,8 +6401,8 @@
 "megabytes"
 msgstr ""
-"opmerking: Voor bepaalde taken heeft JOSM veel geheugen nodig. Het kan "
+"Opmerking: Voor bepaalde taken heeft JOSM veel geheugen nodig. Het kan "
 "noodzakelijk zijn om de volgende\n"
-"       JAVA-optie te specifiëren om de maximale grootte van het "
-"geheugengebruik in megabytes in te stellen"
+"      JAVA-optie te specificeren om de maximale grootte van het toegewezen "
+"geheugen in megabytes in te stellen"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
@@ -6413,5 +6484,5 @@
 "gebruikt."
 
-#: ../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"
@@ -6419,10 +6490,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 "Beeld"
 
-#: ../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
@@ -6431,5 +6502,5 @@
 msgstr "Gereedschappen"
 
-#: ../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
@@ -6437,5 +6508,5 @@
 msgstr "Voorkeuze"
 
-#: ../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
@@ -6446,5 +6517,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355
 msgid "Audio"
 msgstr "Geluid"
@@ -6460,5 +6531,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapFrame.java:391
 msgid "Hide or show this toggle button"
-msgstr "Deze omschakelknop verbergen of tonen"
+msgstr "Deze wisselknop verbergen of tonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:83
@@ -6481,5 +6552,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"
@@ -6487,5 +6558,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"
@@ -6549,10 +6620,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:408
 msgid "Layer not in list."
-msgstr "laag niet in lijst."
+msgstr "Laag niet in lijst."
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:709
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
-msgstr "De laag ''{0}'' moet deel uitmaken van de lijst beschikbare lagen"
+msgstr "De laag ''{0}'' moet in de lijst beschikbare lagen staan"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1205
@@ -6570,5 +6641,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
 msgid "Click to cancel the current operation"
-msgstr "Klik om de huidige operatie te annuleren."
+msgstr "Klik om de huidige bewerking te annuleren."
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -6590,5 +6661,5 @@
 msgid "unset: do not set this property on the selected objects"
 msgstr ""
-"deselecteer: deze eigenschap niet voor de geselecteerde objecten instellen"
+"niet ingesteld: deze eigenschap niet voor de geselecteerde objecten instellen"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150
@@ -6628,5 +6699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
 msgid "Delete objects"
-msgstr "Objecten worden verwijderd"
+msgstr "Objecten verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
@@ -6647,5 +6718,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
@@ -6697,8 +6768,8 @@
 "html>"
 msgstr ""
-"<html>Als alternatief kunt u een <strong>adres voor een tile</strong> "
-"invoeren voor één enkele tile in de indeling <i>zoomlevel/x/y</i>, d.i. "
-"<i>15/256/223</i>. Tile-adressen in de indeling <i>zoom,x,y</i> of <i>zoom;x;"
-"y</i> zijn ook geldig.</html>"
+"<html>Als alternatief kunt u een <strong>tegeladres</strong> invoeren voor "
+"één enkele tegel in de indeling <i>zoomlevel/x/y</i>, d.i. <i>15/256/223</"
+"i>. Tegeladressen in de indeling <i>zoom,x,y</i> of <i>zoom;x;y</i> zijn ook "
+"geldig.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6729,53 +6800,53 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:14
 msgid "Conflict background: no conflict"
-msgstr "Conflict achtergrond: geen conflict"
+msgstr "Conflict op achtergrond: geen conflict"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:15
 msgid "Conflict background: decided"
-msgstr "Conflict achterground: bepaald"
+msgstr "Conflict op achtergrond: bepaald"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:16
 msgid "Conflict background: undecided"
-msgstr ""
+msgstr "Conflict op achtergrond: onbeslist"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:17
 msgid "Conflict background: drop"
-msgstr ""
+msgstr "Conflict op achtergrond: wissen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:18
 msgid "Conflict background: keep"
-msgstr ""
+msgstr "Conflict op achtergrond: behouden"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:19
 msgid "Conflict background: combined"
-msgstr ""
+msgstr "Conflict op achtergrond: gecombineerd"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:20
 msgid "Conflict background: selected"
-msgstr ""
+msgstr "Conflict op achtergrond: geselecteerd"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:22
 msgid "Conflict foreground: undecided"
-msgstr ""
+msgstr "Conflict op voorgrond: onbeslist"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:23
 msgid "Conflict foreground: drop"
-msgstr ""
+msgstr "Conflict op voorgrond: wissen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:24
 msgid "Conflict foreground: keep"
-msgstr ""
+msgstr "Conflict op voorgrond: behouden"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:26
 msgid "Conflict background: empty row"
-msgstr ""
+msgstr "Conflict op achtergrond: lege rij"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:27
 msgid "Conflict background: frozen"
-msgstr ""
+msgstr "Conflict op achtergrond: bevroren"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:28
 msgid "Conflict background: in comparison"
-msgstr ""
+msgstr "Conflict op achtergrond: in vergelijking"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:29
@@ -6839,5 +6910,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
@@ -6847,5 +6918,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"
@@ -6855,5 +6926,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 "Leden"
@@ -6885,6 +6956,6 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
-"Samengevoegde knooppuntenlijst bevroren. Er zijn geen conflicten meer in de "
-"knooppuntenlijst voor deze weg"
+"Lijst met samengevoegde knopen bevroren. Er zijn geen openstaande conflicten "
+"in de lijst met knopen van deze weg"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
@@ -6894,5 +6965,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
 msgid "Pending conflicts in the node list of this way"
-msgstr "Conflicten in de knopen van deze weg"
+msgstr "Openstaande conflicten in de lijst met knopen van deze weg"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:193
@@ -6905,6 +6976,6 @@
 "relation"
 msgstr ""
-"Samengevoegde ledenlijst bevroren. Er zijn geen conflicten meer in de "
-"ledenlijst van deze relatie"
+"Lijst met samengevoegde leden bevroren. Er zijn geen openstaande conflicten "
+"in de lijst met leden van deze relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
@@ -6914,9 +6985,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "Pending conflicts in the member list of this relation"
-msgstr "Nog op te lossen conflicten in de ledenlijst van deze relatie"
+msgstr "Openstaande conflicten in de lijst met leden van deze relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
 msgid "No pending property conflicts"
-msgstr "Geen eigenschapsconflicten"
+msgstr "Geen openstaande conflicten voor eigenschappen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
@@ -6926,5 +6997,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
 msgid "Pending property conflicts to be resolved"
-msgstr "Nog op te lossen eigenschappenconflicten"
+msgstr "Nog openstaande conflicten voor eigenschappen om nog op te lossen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:282
@@ -6959,5 +7030,5 @@
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr "Onverwachte waarde voor parameter \"index\". {0} gekregen."
+msgstr "Onverwachte waarde voor parameter \"index\". Kreeg {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:813
@@ -6972,5 +7043,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:244
 msgid "Compare "
-msgstr "Vergelijk "
+msgstr "Vergelijken "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:279
@@ -6981,5 +7052,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr "Lijst van elementen in mijn dataset, m.a.w. de lokale dataset"
+msgstr "Lijst van elementen in mijn gegevensset, d.i. de lokale gegevensset"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:285
@@ -7004,5 +7075,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr "Lijst an elementen in hun dataset, m.a.w. de dataset op de server"
+msgstr ""
+"Lijst van elementen in hun gegevensset, d.i. de gegevensset op de server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:424
@@ -7013,6 +7085,6 @@
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
-"Kopieer de geselecteerde knooppunten naar het begin van de samengevoegde "
-"knooppuntenlijst"
+"Kopieer de geselecteerde knopen naar het begin van de samengevoegde lijst "
+"met knopen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:451
@@ -7031,6 +7103,6 @@
 "merged elements."
 msgstr ""
-"Kopieer mijn geselecteerde elementen voor het begin van de lijst met "
-"samengevoegde elementen."
+"Kopieer mijn geselecteerde elementen vóór het eerste geselecteerde element "
+"in de lijst van samengevoegde elementen."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:514
@@ -7060,5 +7132,5 @@
 "of merged elements."
 msgstr ""
-"Kopieer hun geselecteerde elementen voor het eerste geselecteerde element in "
+"Kopieer hun geselecteerde elementen vóór het eerste geselecteerde element in "
 "de lijst met samengevoegde elementen."
 
@@ -7097,10 +7169,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:729
 msgid "Move down the selected entries by one position."
-msgstr "Verplaats de geselecteerde elementen één positie naar beneden"
+msgstr "Geselecteerde elementen één positie omlaag schuiven"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:759
 #: ../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
@@ -7114,6 +7186,5 @@
 msgid "Remove the selected entries from the list of merged elements."
 msgstr ""
-"Verwijder de geselecteeerde elementen uit de lijst van samengevoegde "
-"elementen."
+"Verwijder de geselecteerde items uit de lijst van samengevoegde elementen."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:790
@@ -7141,6 +7212,6 @@
 "html>"
 msgstr ""
-"<html>Klik <strong>{0}</strong> om te starten met het samenvoegen van mijn "
-"en hun ingaves.</html>"
+"<html>Klik op <strong>{0}</strong> om te beginnen met het samenvoegen van "
+"mijn en hun items.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:854
@@ -7150,5 +7221,6 @@
 "html>"
 msgstr ""
-"<html>Klik <strong>{0}</strong> om het samenvoegen te beëindigen.</html>"
+"<html>Klik op <strong>{0}</strong> om het samenvoegen van mijn en hun items "
+"te beëindigen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
@@ -7156,6 +7228,6 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] "Mijn versie ({0} invoer)"
-msgstr[1] "Mijn versie ({0} invoeren)"
+msgstr[0] "Mijn versie ({0} item)"
+msgstr[1] "Mijn versie ({0} items)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875
@@ -7163,6 +7235,6 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Samengevoegde versie ({0} invoer)"
-msgstr[1] "Samengevoegde versie ({0} invoeren)"
+msgstr[0] "Samengevoegde versie ({0} item)"
+msgstr[1] "Samengevoegde versie ({0} items)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:878
@@ -7170,6 +7242,6 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] "Hun versie ({0} invoer)"
-msgstr[1] "Hun versie ({0} invoeren)"
+msgstr[0] "Hun versie ({0} items)"
+msgstr[1] "Hun versie ({0} items)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:941
@@ -7180,6 +7252,6 @@
 "adjustment."
 msgstr ""
-"Veranderlijke {0} is nog niet geregistreerd. Kan participatie in "
-"gesynchroniseerde correctie niet vastzetten."
+"Veranderlijke {0} is nog niet geregistreerd. Kan deelnemen in "
+"gesynchroniseerde aanpassingen niet instellen."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:956
@@ -7196,10 +7268,10 @@
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
-"Samengevoegde knooppunten werden nog niet vastgezet. Er kan nog geen "
-"resolutiecommando worden opgebouwd."
+"Samengevoegde knopen zijn nog niet vastgezet. Kan nog geen opdracht voor "
+"oplossing bouwen."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Eigenschappen in mijn lokale dataset"
+msgstr "Eigenschappen in mijn gegevensset, d.i. de lokale gegevensset"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
@@ -7208,10 +7280,11 @@
 "elements when merge decisions are applied."
 msgstr ""
-"Eigenschappen in het samengevoegde element. Deze zullen de eigenschappen in "
-"mijn elementen vervangen wanneer de samenvoegbeslissingen worden toegepast."
+"Eigenschappen in het samengevoegde element. Zij zullen de eigenschappen in "
+"mijn elementen vervangen als de beslissingen om samen te voegen worden "
+"toegepast."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Eigenschappen in hun serverdataset"
+msgstr "Eigenschappen in hun gegevensset, d.i. de gegevensset op de server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:106
@@ -7226,5 +7299,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:256
 msgid "Referenced by:"
-msgstr "Hier wordt naar gerefereerd door:"
+msgstr "Hier wordt naar verwezen door:"
 
 #.
@@ -7239,4 +7312,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 "verwijderd"
@@ -7256,18 +7330,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
 msgid "Undecide conflict between different coordinates"
-msgstr ""
-"Maak beslissing ongedaan voor conflict tussen verschillende coördinaten"
+msgstr "Onbeslist conflict tussen verschillende coördinaten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:441
 msgid "Keep my deleted state"
-msgstr "Behoud mijn status van verwijderd"
+msgstr "Behoud mijn status van verwijdering"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:456
 msgid "Keep their deleted state"
-msgstr "Behoud hun status van verwijderd"
+msgstr "Behoud hun status van verwijdering"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471
 msgid "Undecide conflict between deleted state"
-msgstr "Maak beslissing ongedaan i.v.m. verwijderd status"
+msgstr "Onbeslist conflict tussen status van verwijdering"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -7278,6 +7351,6 @@
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
-"De samengevoegde knooppunten werden nog niet vastgelegd. Er kan nog geen "
-"resolutiecommando worden aangemaakt"
+"Samengevoegde knopen zijn nog niet vastgezet. Kan nog geen opdracht voor "
+"oplossing bouwen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:28
@@ -7298,5 +7371,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr "De samengevoegde dataset zal geen tag bevatten met als sleutel {0}"
+msgstr "De samengevoegde gegevensset zal geen tag bevatten met de sleutel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:41
@@ -7304,11 +7377,11 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr "Mijn dataset bevat geen tag met als sleutel {0}"
+msgstr "Mijn gegevensset bevat geen tag met de sleutel {0}"
 
 #. setting up the properties table
 #: ../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
@@ -7330,6 +7403,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
@@ -7351,25 +7424,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
 msgid "Cannot apply undecided tag merge item."
-msgstr "Onbeslist tagsamenvoegitem kan niet worden toegepast."
+msgstr "Onbeslist item voor samenvoegen van tag kan niet worden toegepast."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
 msgid "My version (local dataset)"
-msgstr "Mijn versie (lokale dataset)"
+msgstr "Mijn versie (lokale gegevensset)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
 msgid "Their version (server dataset)"
-msgstr "Hun versie (serverdataset)"
+msgstr "Hun versie (gegevensset op server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
 msgid "Keep the selected key/value pairs from the local dataset"
-msgstr "Behoud de geselecteerde sleutel/waarde-paren uit de lokale dataset"
+msgstr "Behoud de geselecteerde sleutel/waarde-paren uit de lokale gegevensset"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
 msgid "Keep the selected key/value pairs from the server dataset"
-msgstr "Behoud de geselecteerde sleutel/waarde-paren uit de serverdataset"
+msgstr ""
+"Behoud de geselecteerde sleutel/waarde-paren uit de gegevensset op de server"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
 msgid "Undecide"
-msgstr "Maak beslissing ongedaan"
+msgstr "Onbeslist"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
@@ -7381,5 +7455,5 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr "Hun dataset bevat geen tag met als sleutel {0}"
+msgstr "Hun gegevensset bevat geen tag met de sleutel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:132
@@ -7398,11 +7472,10 @@
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr ""
-"Conflicten bij het combineren van knooppunten - doelknooppunt is ''{0}''"
+msgstr "Conflicten bij het combineren van knopen - doelknoop is ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:283
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:326
 msgid "No conflicts to resolve"
-msgstr "Er zijn geen conflicten die moeten worden verzoend"
+msgstr "Er zijn geen conflicten die moeten worden opgelost"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
@@ -7416,5 +7489,5 @@
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:403
 msgid "Apply resolved conflicts"
-msgstr "Conflictoplossing toepassen"
+msgstr "Pas opgeloste conflicten toe"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:361
@@ -7440,5 +7513,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"
@@ -7451,15 +7524,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:94
 msgid "Please decide which values to keep"
-msgstr "Gelieve te beslissen welke waardes behouden moeten blijven"
+msgstr "Bepaal welke waardes behouden moeten blijven"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:101
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr "Waarde ''{0}'' zal worden toegepast voor ''{1}''"
+msgstr "Waarde ''{0}'' zal worden toegepast voor sleutel ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:108
 #, java-format
 msgid "The key ''{0}'' and all its values are going to be removed"
-msgstr "De sleutel ''{0}'' en al z’n waardes zullen worden verwijderd"
+msgstr "De sleutel ''{0}'' en al zijn waarden zullen worden verwijderd"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:114
@@ -7467,11 +7540,11 @@
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
 msgstr ""
-"Alle waardes bijeengevoegd als ''{0}'' zullen worden toegepast voor sleutel "
-"''{1}''"
+"Alle waarden die zijn samengevoegd als ''{0}'' zullen worden toegepast voor "
+"sleutel ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
 #, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Tagverzameling bevat de geselecteerde waarde ''{0}'' niet."
+msgstr "Tagverzameling bevat niet de geselecteerde waarde ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135
@@ -7484,5 +7557,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:48
 msgid "Tags from nodes"
-msgstr "Tags van knooppunten"
+msgstr "Tags van knopen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
@@ -7523,5 +7596,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
@@ -7533,5 +7606,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
@@ -7544,9 +7617,10 @@
 #, java-format
 msgid "Position {0} is out of range. Current number of members is {1}."
-msgstr "Positie {0} valt buiten geldig bereik. Het huidig aantal leden is {1}."
+msgstr ""
+"Positie {0} valt buiten geldig bereik. Het huidige aantal leden is {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:29
 msgid "Remove this relation member from the relation"
-msgstr "Verwijder dit lid uit de relatie"
+msgstr "Verwijder dit lid van de relatie uit de relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
@@ -7574,5 +7648,5 @@
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:804
 msgid "Enter a role for all relation memberships"
-msgstr "Geef een rol op voor alle relatielidmaatschappen"
+msgstr "Geef een rol op voor alle lidmaatschappen van de relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
@@ -7587,6 +7661,6 @@
 "modified relations.</html>"
 msgstr ""
-"<html>Selecteer om het ingeven van een tag die op <br>alle gewijzigde "
-"relaties zal worden toegepast, aan te zetten .</html>"
+"<html>Selecteer om het ingeven van een tag die op<br>alle gewijzigde "
+"relaties zal worden toegepast, aan te zetten.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
@@ -7594,10 +7668,11 @@
 msgctxt "tag"
 msgid "Key:"
-msgstr "Sleutel:"
+msgstr "Toets:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:829
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Geef een sleutel op, bv. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Geef een sleutel op,  d.i. <strong><tt>fixme</tt></strong></html>"
 
 #. Strings in GTK ColorChooser
@@ -7614,5 +7689,5 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
-"<html>Geef een waarde op voor een tag, bv. <strong><tt>kijk leden na</tt></"
+"<html>Geef een waarde op voor een tag,  d.i <strong><tt>kijk leden na</tt></"
 "strong></html>"
 
@@ -7627,10 +7702,10 @@
 "place of the original way in the relation.</html>"
 msgstr ""
-"<html>De gecombineerde wegen zijn leden van een of meerdere relaties Gelieve "
-"te beslissen of u deze lidmaatschappen wenst te <strong>behouden</strong> "
-"voor de gecombineerde weg, of deze wenst te <strong>verwijderen</strong>."
-"<br>Normaal zal de eerste weg <strong>behouden</strong> blijven en zullen de "
-"andere wegen die lid zijn van dezelfde relatie worden <strong>verwijderd</"
-"strong>: de gecombineerde weg vervangt dan de oorspronkelijke weg in de "
+"<html>De gecombineerde wegen zijn leden van een of meerdere relaties. Bepaal "
+"of u deze lidmaatschappen wilt <strong>behouden</strong> voor de "
+"gecombineerde weg, of deze wilt <strong>verwijderen</strong>.<br>Normaal zal "
+"de eerste weg <strong>behouden</strong> blijven en zullen de andere wegen "
+"die lid zijn van dezelfde relatie worden <strong>verwijderd</strong>: de "
+"gecombineerde weg neemt de plaats in van de oorspronkelijke weg in de "
 "relatie.</html>"
 
@@ -7645,21 +7720,19 @@
 "the place of the original node in the relation.</html>"
 msgstr ""
-"<html>De gecombineerde knooppunten zijn leden van een of meerdere relaties "
-"Gelieve te beslissen of u deze lidmaatschappen wenst te <strong>behouden</"
-"strong> voor het gecombineerde knooppunt, of deze wenst te "
-"<strong>verwijderen</strong>.<br>Normaal zal het eerste knooppunt "
-"<strong>behouden</strong> blijven en zullen de andere knooppunten die lid "
-"zijn van dezelfde relatie worden <strong>verwijderd</strong>: het "
-"gecombineerde knooppunt vervangt dan het oorspronkelijke knooppunt in de "
-"relatie.</html>"
+"<html>De samengevoegde knopen zijn leden van een of meer relaties. Bepaal of "
+"u deze lidmaatschappen wilt <strong>behouden</strong> voor de doelknoop, of "
+"deze wilt <strong>verwijderen</strong>.<br>Normaal zal de eerste knoop "
+"<strong>behouden</strong> blijven en zullen de andere knopen die lid zijn "
+"van dezelfde relatie worden <strong>verwijderd</strong>: de doelknoop neemt "
+"de plaats in van de oorspronkelijke knoop in de relatie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:869
 msgid "Apply this role to all members"
-msgstr "Pas deze rol top alle leden"
+msgstr "Pas deze rol toe op alle leden"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr "Oorspronkelijke weg"
+msgstr "Orig. weg"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
@@ -7671,22 +7744,22 @@
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
-"<html>Gelieve de waardes te selecteren die moeten worden behouden voor de "
-"volgende tags.</html>"
+"<html>Selecteer de waarden die moeten worden behouden voor de volgende tags."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:1277
 msgid "Show tags with conflicts only"
-msgstr "Toon enkel de conflicterende tags"
+msgstr "Toon alleen de tags met conflicten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:1278
 msgid "Show tags with multiple values only"
-msgstr "Toon enkel de tags waarvoor meerdere waardes voorhanden zijn"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+msgstr "Toon alleen de tags met meerdere waarden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:164
 msgid "For selected objects only"
-msgstr "Enkel voor de geselecteere objecten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+msgstr "Alleen voor de geselecteerde objecten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:165
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7694,24 +7767,24 @@
 "html>"
 msgstr ""
-"<html>Aanvinken om enkel wijzigingensets te tonen voor de huidig "
-"geselecteerde objecten.<br>Afvinken om alle wijzigingensets te tonen voor "
-"objecten in de huidige laag.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247
+"<html>Selecteren om alleen wijzigingensets te tonen voor de huidige "
+"geselecteerde objecten.<br>Niet selecteren om alle wijzigingensets te tonen "
+"voor objecten in de huidige gegevenslaag.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:243
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Changesets"
 msgstr "Wijzigingensets"
 
-#: ../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 "Open een lijst met wijzigingensets in de huidige laag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294
+msgstr "Open de lijst met wijzigingensets in de huidige laag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:290
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
-"Selecteer alle objecten die zijn toegewezen aan de geselecteerde "
+"Selecteer alle objecten die zijn toegewezen aan de huidige geselecteerde "
 "wijzigingensets"
 
-#: ../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
@@ -7719,24 +7792,25 @@
 msgstr "Downloaden"
 
-#: ../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 ""
-"Haal informatie op van de OSM-server over de geselecteerde wijzigingensets"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379
+"Download informatie van de server van OSM over de geselecteerde "
+"wijzigingensets"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:375
 msgid "Closes the selected open changesets"
-msgstr "Sluit de geselecteerde open wijzigingenset"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410
+msgstr "Sluit de geselecteerde geopende wijzigingensets"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:406
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
 msgid "Show info"
 msgstr "Info tonen"
 
-#: ../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 "Open een webpagina voor iedere geselecteerde wijzigingenset"
+msgstr "Open een webpagina voor elke geselecteerde wijzigingenset"
 
 #. 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
@@ -7744,8 +7818,9 @@
 msgstr "Details"
 
-#: ../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 ""
-"Opent het Wijzigingensetsbewerkvenster voor de geselecteerde wijzigingenset"
+"Opent het venster Beheren wijzigingensets voor de geselecteerde "
+"wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
@@ -7757,17 +7832,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 msgid "Open a list of all commands (undo buffer)."
-msgstr "Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)."
+msgstr "Open een lijst van alle opdrachten (buffer Ongedaan maken)."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../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
@@ -7787,10 +7862,10 @@
 "Selects the objects that take part in this command (unless currently deleted)"
 msgstr ""
-"Selecteert de objecten die deel uitmaken van die commando (uitgezonderd de "
-"verwijderde objecten)"
+"Selecteert de objecten die deel uitmaken van die opdracht (tenzij momenteel "
+"verwijderd)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:369
 msgid "Undo the selected and all later commands"
-msgstr "Maak de geselecteerde en alle latere opdrachten ongeda"
+msgstr "Maak de geselecteerde en alle latere opdrachten ongedaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
@@ -7814,9 +7889,9 @@
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
-"Een samenvoegingdialoog voor de geselecteerde elementen in bovenstaande "
-"lijst openen."
+"Een dialoogvenster om samen te voegen openen voor alle geselecteerde items "
+"in bovenstaande lijst."
 
 #: ../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
@@ -7833,5 +7908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170
 msgid "Apply resolved conflicts and close the dialog"
-msgstr "Opgeloste conflicten toepassen en dialoog sluiten"
+msgstr "Opgeloste conflicten toepassen en sluit het dialoogvenster"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
@@ -7856,10 +7931,10 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
-"<html>U bent niet klaar met het samenvoegen van de verschillen voor dit "
-"conflict.<br>Conflictoplossingen zullen niet worden toegepast, vooraleer "
-"alle verschillen<br>werden opgelost.<br>Klik <strong>{0}</strong> om toch af "
-"te sluiten.<strong> Reeds<br>opgeloste verschillen zullen niet in acht "
-"worden genomen.</strong><br>Klik<strong>{1}</strong> om door te gaan met het "
-"oplossen van conflicten.</html>"
+"<html>U bent nog niet klaar met het samenvoegen van de verschillen voor dit "
+"conflict.<br>Oplossingen voor conflicten zullen niet worden toegepast "
+"voordat alle verschillen<br>zijn opgelost.<br>Klik op <strong>{0}</strong> "
+"om toch af te sluiten.<strong> Reeds<br>opgeloste verschillen zullen niet "
+"worden toegepast.</strong><br>Klik op <strong>{1}</strong> om terug te gaan "
+"naar het oplossen van conflicten.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
@@ -7879,5 +7954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:64
 msgid "Filter objects and hide/disable them."
-msgstr "Filter objecten en verberg ze of schakel ze uit"
+msgstr "Filter objecten en ze verbergen of uitschakelen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:83
@@ -7891,9 +7966,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 msgid "Inverse filter"
-msgstr "Inverteer filter"
+msgstr "Filter omdraaien"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 msgid "Filter mode"
-msgstr "Filtermodus"
+msgstr "modus Filteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
@@ -7920,5 +7995,5 @@
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filter verborgen: {0} Uitgeschakeld: {1}"
+msgstr "Filter Verborgen: {0} Uitgeschakeld: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:59
@@ -7931,5 +8006,5 @@
 msgctxt "filter"
 msgid "E"
-msgstr "I"
+msgstr "O"
 
 #. column header: hide filter
@@ -7998,21 +8073,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:388
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr "</p><p>Filterdialoog afsluiten om alle objecten te zien.<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 "Geschiedenis"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
+msgstr ""
+"</p><p>Dialoogvenster Filter afsluiten om alle objecten te zien.<p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64
 msgid "Display the history of all selected items."
 msgstr "De geschiedenis van alle geselecteerde items tonen."
 
-#: ../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 "Object met historiek"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
+msgstr "Object met historie"
+
+#: ../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
@@ -8022,10 +8092,10 @@
 msgstr "Herladen"
 
-#: ../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 "Alle geselecteerde objecten herladen en de lijst verversen."
+msgstr "Alle huidige geselecteerde objecten herladen en de lijst verversen."
 
 #. 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
@@ -8037,149 +8107,140 @@
 msgstr "Weergeven"
 
-#: ../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 "Historiek voor de geselecteerde objecten tonen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+msgstr "Historie voor de geselecteerde objecten tonen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66
 msgid "Advanced object info"
 msgstr "Geavanceerde objectinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77
 msgid "map style"
 msgstr "kaartstijl"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
-msgid "In conflict with:\n"
-msgstr "In conflict met:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146
-#, java-format
-msgid "Node id={0}"
-msgstr "Node id={0}"
-
-#: ../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 " niet in data set"
-
-#: ../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 "Weg: "
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
-msgid " incomplete\n"
-msgstr " niet compleet\n"
-
-#: ../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 "Weg id={0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
-#, java-format
-msgid " {0} node; "
-msgid_plural " {0} nodes; "
-msgstr[0] " {0} knooppunt; "
-msgstr[1] " {0} knooppunten; "
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182
-msgid "  nodes:\n"
-msgstr "  knooppunten:\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
-#, java-format
-msgid "Relation id={0}"
-msgstr "Relatie 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 "<nieuw object>"
 
-#: ../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 "; verwijderd"
+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 "; verwijderd-op-server"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227
-msgid "; modified"
-msgstr "; gewijzigd"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230
-msgid "; filtered/hidden"
-msgstr "; gefilterd/verborgen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233
-msgid "; filtered/disabled"
-msgstr "; gefilterd/uitgeschakeld"
-
-#: ../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 " (omgekeerd)"
-
-#: ../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 "id: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:297
-#, java-format
-msgid " name: {0}"
-msgstr " naam: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300
-#, java-format
-msgid " {0} name: {1}"
-msgid_plural " {0} names: {1}"
-msgstr[0] " {0} naam: {1}"
-msgstr[1] " {0} namen: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
+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: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 "Stijl Cache voor \"{0}\":"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327
+msgstr "Cache voor stijlen voor \"{0}\":"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331
 #, java-format
 msgid ""
@@ -8188,6 +8249,9 @@
 "> applying {0} style \"{1}\"\n"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:329
+"\n"
+"\n"
+"> toepassen {0} stijl \"{1}\"\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:333
 #, java-format
 msgid ""
@@ -8195,6 +8259,8 @@
 "Range:{0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:334
+"\n"
+"Bereik:{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:338
 #, java-format
 msgid ""
@@ -8203,6 +8269,9 @@
 "> skipping \"{0}\" (not active)"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
+"\n"
+"\n"
+"> overslaan \"{0}\" (niet actief)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341
 msgid ""
 "\n"
@@ -8210,25 +8279,30 @@
 "List of generated Styles:\n"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:350
+"\n"
+"\n"
+"Lijst van gegenereerde stijlen:\n"
+
+#: ../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
+msgstr "De 2 geselecteerde objecten hebben identieke caches voor stijl."
+
+#: ../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
+msgstr "De 2 geselecteerde objecten hebben verschillende caches voor stijl"
+
+#: ../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
+"Waarschuwing: De 2 geselecteerde objecten hebben gelijke, maar niet "
+"identieke caches voor stijl."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:367
 msgid "xml"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:365
+msgstr "xml"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:369
 msgid "mapcss"
-msgstr ""
+msgstr "mapcss"
 
 #. item "Ways/Path" combo "Wheelchairs" display value
@@ -8244,5 +8318,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
@@ -8254,10 +8328,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
@@ -8287,8 +8361,27 @@
 "deg 42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
 msgstr ""
+"Voer de coördinaten in voor de nieuwe knoop.<br/>U kunt breedte- en "
+"lengtegraad scheiden door een spatie, komma of punt-komma.<br/>Gebruik "
+"positieve getallen of de tekens N, E om de kardinale richting Noord of Oost "
+"aan te geven.<br/>Voor de kardinale richtingen Zuid en West kunt u ofwel "
+"negatieve getallen of de tekens S, W gebruiken.<br/>De waarde van de "
+"coördinaat mag in één van drie indelingen worden opgegeven:"
+"<ul><li><i>graden</i><tt>&deg;</tt></li><li><i>graden</i><tt>&deg;</tt> "
+"<i>minuten</i><tt>&#39;</tt></li><li><i>graden</i><tt>&deg;</tt> <i>minuten</"
+"i><tt>&#39;</tt> <i>seconden</i><tt>&quot</tt></li></ul>Symbolen <tt>&deg;</"
+"tt>, <tt>&#39;</tt>, <tt>&prime;</tt>, <tt>&quot;</tt>, <tt>&Prime;</tt> "
+"zijn optioneel.<br/><br/>Enkele voorbeelden:<ul><li>49.29918&deg; "
+"19.24788&deg;</li><li>N 49.29918 E 19.24788</li><li>W 49&deg;29.918&#39; S "
+"19&deg;24.788&#39;</li><li>N 49&deg;29&#39;04&quot; E 19&deg;24&#39;43&quot;"
+"</li><li>49.29918 N, 19.24788 E</li><li>49&deg;29&#39;21&quot; N "
+"19&deg;24&#39;38&quot; E</li><li>49 29 51, 19 24 18</li><li>49 29, 19 24</"
+"li><li>E 49 29, N 19 24</li><li>49&deg; 29; 19&deg; 24</li><li>N 49&deg; 29, "
+"W 19&deg; 24</li><li>49&deg; 29.5 S, 19&deg; 24.6 E</li><li>N 49 29.918 E 19 "
+"15.88</li><li>49 29.4 19 24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 "
+"deg 42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:130
 msgid "Projected coordinates:"
-msgstr ""
+msgstr "Geprojecteerde coördinaten:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:138
@@ -8296,27 +8389,29 @@
 "Enter easting and northing (x and y) separated by space, comma or semicolon."
 msgstr ""
+"Voer easting en northing (x en y) in, gescheiden door een spatie, komma of "
+"punt-komma."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:154
 msgid "Lat/Lon"
-msgstr ""
+msgstr "Lat/Lon"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:155
 msgid "East/North"
-msgstr ""
+msgstr "Oost/Noord"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:258
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:262
 msgid "Please enter a GPS coordinates"
-msgstr "Gelieve GPS-coördinaten op te geven"
+msgstr "Voer GPS-coördinaten in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:280
 msgid "Please enter a Easting and Northing"
-msgstr ""
+msgstr "Voer een Easting en Northing in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:144
 #, java-format
 msgid "Toggle visibility of layer: {0}"
-msgstr ""
+msgstr "Schakelen van zichtbaarheid van laag: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -8327,5 +8422,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Open a list of all loaded layers."
-msgstr "Een lijst met alle geladen lagen openen."
+msgstr "Open een lijst met alle geladen lagen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:353
@@ -8334,5 +8429,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 "Tonen/Verbergen"
@@ -8351,5 +8446,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 "Activeren"
@@ -8369,25 +8464,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:822
 msgid "layer is currently visible (click to hide layer)"
-msgstr "laag is nu zichtbaar (klik om ze te verbergen)"
+msgstr "laag is nu zichtbaar (klik om te verbergen)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:822
 msgid "layer is currently hidden (click to show layer)"
-msgstr "laag is nu verborgen (klik om ze te tonen)"
+msgstr "laag is nu verborgen (klik om te weer te geven)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:836
 msgid "this layer is the active layer"
-msgstr "dit is de actieve laag"
+msgstr "deze laag is de actieve laag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:836
 msgid "this layer is not currently active (click to activate)"
-msgstr "laag is nu niet actief (klik om ze te activeren)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:952
+msgstr "deze laag is nu niet actief (klik om te activeren)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:953
 msgid "Move the selected layer one row up."
-msgstr "De geselecteerde laag een rij omhoog verplaatsen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:973
+msgstr "De geselecteerde laag één rij omhoog verplaatsen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:974
 msgid "Move the selected layer one row down."
-msgstr "De geselecteerde laag een rij omlaag verplaatsen."
+msgstr "De geselecteerde laag één rij omlaag verplaatsen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:41
@@ -8424,9 +8519,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:376
 msgid "Reload from file"
-msgstr "Terugzetten uit bestand"
+msgstr "Opnieuw laden uit bestand"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:377
 msgid "reload selected styles from file"
-msgstr "Geselecteerde stijlen terugzetten uit bestand"
+msgstr "Geselecteerde stijlen opnieuw laden uit bestand"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:425
@@ -8442,5 +8537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:231
 msgid "Reloading style sources"
-msgstr "Terugzetten van stijlbronnen uit bestand"
+msgstr "Stijlbronnen opnieuw laden uit bestand"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:480
@@ -8459,5 +8554,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"
@@ -8466,9 +8561,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:586
 msgid "Title:"
-msgstr "Titel"
+msgstr "Titel:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:588
 msgid "URL:"
-msgstr "URL-adres:"
+msgstr "URL:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:590
@@ -8490,5 +8585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 msgid "Style is currently active?"
-msgstr "Stijl is op dit moment actief?"
+msgstr "Is stijl op dit moment actief?"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
@@ -8500,173 +8595,163 @@
 
 #. 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 "Relaties"
 
-#: ../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 "Een lijst met alle relaties openen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:272
+msgstr "Open een lijst met alle relaties."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:273
 msgid "Open an editor for the selected relation"
-msgstr "Een editor voor de geselecteerde relatie openen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:313
+msgstr "Open een bewerker voor de geselecteerde relatie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:314
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../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
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:109
 msgid "Create a new relation"
-msgstr "Een nieuwe relatie aanmaken"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:388
+msgstr "Een nieuwe relatie maken"
+
+#: ../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
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
-"Maak een kopie van de relatie aan en open ze in een ander bewerkvenster"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
+"Maak een kopie van de relatie en open die in een ander bewerkingsvenster"
+
+#: ../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
+msgstr "Voeg de geselecteerde relaties toe aan de huidige selectie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Set the current selection to the list of selected relations"
-msgstr "Zet de huidige selectie op de lijst van de geselecteerde relaties"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
+msgstr "Stel de huidige selectie in op de lijst van de geselecteerde relaties"
+
+#: ../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
+msgstr "Selecteer relatie (toevoegen)"
+
+#: ../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 "Selekteer relatie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+msgstr "Selecteer relatie"
+
+#: ../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
+"Voeg de leden van alle geselecteerde relaties toe aan de huidige selectie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:468
 msgid "Select the members of all selected relations"
 msgstr "Selecteer de leden van alle geselecteerde relaties"
 
-#: ../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
+msgstr "Selecteer leden (toevoegen)"
+
+#: ../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 "Selecteer de leden"
 
-#: ../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 "Haal alle leden van de geselecteerde relaties op vanaf de server"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
+msgstr "Download alle leden van de geselecteerde relaties"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Download members"
-msgstr "Haal leden op vanaf de server"
-
-#: ../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
+msgstr "Download leden"
+
+#: ../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 ""
-"Haal onvolledig afgehaalde leden van de geselecteerde relaties op vanaf de "
-"server"
-
-#: ../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
+msgstr "Download incomplete leden van de geselecteerde relaties"
+
+#: ../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 "Haal onvolledig afgehaalde leden op vanaf de server"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772
+msgstr "Download incomplete leden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:773
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../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 "Selectie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
+msgid "Open a selection list window."
+msgstr "Open een venster voor een selectielijst."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129
 msgid "Current Selection"
 msgstr "Huidige selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
-msgid "Open a selection list window."
-msgstr "Een selectielijstscherm openen."
-
-#: ../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 "Zoeken naar objecten"
 
+#: ../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 "Op selectie inzoomen."
-
+msgstr "Op selectie inzoomen"
+
+#: ../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 "Naar de geselecteerde element(en) zoomen."
+msgstr "Inzoomen op de geselecteerde element(en)."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:374
+msgid "Call editor for relation"
+msgstr "Roep bewerkingsvenster op voor relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
-msgid "Call editor for relation"
-msgstr "Roep bewerkvenster op voor relatie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:376
 msgid "Call relation editor for selected relation"
-msgstr "Roep bewerkvenster op voor geselecteerde relatie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1226
+msgstr "Roep bewerkingsvenster op voor geselecteerde relatie"
+
+#: ../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 "Selecteer in relatielijst"
 
-#: ../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 "Selecteer relatie in relatielijst"
 
-#: ../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 "Selectie"
-
-#: ../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 "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{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 "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855
-msgid "Get detailed information on the internal state of the objects."
-msgstr ""
-"Haal gedetailleerde informatie over de interne staat van de objecten op."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
-msgid "Inspect"
-msgstr "Inspecteren"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
 msgid "Undock the panel"
-msgstr "Laat paneel drijven"
+msgstr "Laat venster zweven"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:430
@@ -8674,11 +8759,11 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
-"Sluit dit paneel. U kunt het opnieuw openen met de knoppen in de linker "
-"werkbalk."
+"Sluit dit venster. U kunt het opnieuw openen met de knoppen in de werkbalk "
+"links."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/KeySignaturesDialog.java:134
 msgid "Click to minimize/maximize the panel content"
-msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
+msgstr "Klik om de vensterinhoud te verkleinen/vergroten"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:70
@@ -8690,5 +8775,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:70
 msgid "Open a list of people working on the selected objects."
-msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken."
+msgstr "Open een lijst met mensen die aan de geselecteerde objecten werken."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:152
@@ -8712,6 +8797,6 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
-"Opgelet: er wordt slecht voor de eerste {0} van de {1} geselecteerde "
-"gebruikers een infovenster geopend"
+"Waarschuwing: er wordt slechts een infovenster voor de eerste {0} van {1} "
+"geselecteerde gebruikers geopend"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:239
@@ -8721,14 +8806,14 @@
 "this system.</html>"
 msgstr ""
-"<html>Het was niet mogelijk om een URL samen te stellen, omdat de encodering "
-"''{0}''<br>niet voorhanden is op dit systeem.</html>"
+"<html>Niet mogelijk om een URL samen te stellen, omdat de codering "
+"''{0}''<br>ontbreekt op dit systeem.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:241
 msgid "Missing encoding"
-msgstr "encodering niet voorhanden"
+msgstr "Codering ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
 msgid "Load CT"
-msgstr "CT (bijdragevoorwaarden) laden"
+msgstr "CT (voorwaarden om bij te dragen) laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:265
@@ -8737,7 +8822,7 @@
 "agreed to the new contributor terms will show a green check mark."
 msgstr ""
-"Haalt informatie over de herlicentiëringsstatus op van de server. Gebruikers "
-"die hebben ingestemd met de nieuwe bijdragevoorwaarden hebben een groen "
-"vinkje naast hun gebruikersnaam."
+"Laad informatie over de status van wijzigen van licentie vanaf de server. "
+"Gebruikers die hebben ingestemd met de nieuwe voorwaarden om bij te dragen "
+"hebben een groen vinkje naast hun gebruikersnaam.."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
@@ -8751,14 +8836,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "CT"
-msgstr "CT (bijdragevoorwaarden)"
+msgstr "CT (voorwaarden om bij te dragen)"
 
 #: ../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 "Open het scherm voor valideren."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
 msgid "Validation results"
-msgstr "Validatieresultaten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
-msgid "Open the validation window."
-msgstr "Het validatiescherm openen."
+msgstr "Resultaten van valideren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
@@ -8832,5 +8920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:267
 msgid "Changeset Management Dialog"
-msgstr "Wijzigingenset-beheervenster"
+msgstr "Venster Beheren wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
@@ -8847,5 +8935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
 msgid "Launch the dialog for querying changesets"
-msgstr "Het dialoogvenster voor het aanvragen van wijzigingensets openen"
+msgstr "Het dialoogvenster voor het bevragen van wijzigingensets openen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
@@ -8872,9 +8960,9 @@
 msgstr ""
 "Dit werkt de geselecteerde wijzigingensets bij met de huidige gegevens vanaf "
-"de OSM-server"
+"de server van OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr "Wijzigingensetinhoud downloaden"
+msgstr "Inhoud wijzigingenset downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
@@ -8889,5 +8977,5 @@
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
 msgstr ""
-"Haal mijn wijzigingensets op vanaf de OSM-server (maximaal 100 "
+"Download mijn wijzigingensets vanaf de server van OSM (max. 100 "
 "wijzigingensets)"
 
@@ -8898,7 +8986,8 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
-"<html>JOSM draait momenteel met een anonieme gebruiker. Het kan geen<br/"
-">wijzigingensets van de OSM-server downloaden tenzij u uw OSM-gebruikersnaam "
-"en<br/>-wachtwoord invult in de JOSM voorkeuren.</html>"
+"<html>JOSM wordt momenteel uitgevoerd door een anonieme gebruiker. "
+"Downloaden van uw<br/>wijzigingensets vanaf de server van OSM is niet "
+"mogelijk tenzij u uw gebruikersnaam voor OSM<br/> en het wachtwoord invult "
+"in de voorkeuren van JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -8911,5 +9000,5 @@
 msgctxt "changeset.state"
 msgid "Open"
-msgstr "Open"
+msgstr "Openen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
@@ -8946,5 +9035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr "Gecreëerd op"
+msgstr "Gemaakt op"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
@@ -8959,5 +9048,5 @@
 #: ../plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java:184
 msgid "Downloading changeset content"
-msgstr "Wijzigingensetsinhoud downloaden"
+msgstr "Downloaden van inhoud wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
@@ -8976,5 +9065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
 msgid "Download content"
-msgstr "Inhoud afhalen van server"
+msgstr "Inhoud downloaden van server"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
@@ -8983,5 +9072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr "Wijzigingensetsgegevens afhalen van OSM-server"
+msgstr "Downloaden van inhoud van wijzigingenset van de server van OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
@@ -8993,5 +9082,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
 msgid "Update the changeset content from the OSM server"
-msgstr "Wijzigingensetsinhoud bijwerken vanaf de OSM-server"
+msgstr "Inhoud van wijzigingenset bijwerken vanaf de server van OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
@@ -9025,8 +9114,8 @@
 msgstr[0] ""
 "<html>Het geselecteerde object is niet beschikbaar in de "
-"huidige<br>bewerkingslaag''{0}''.</html>"
+"huidige<br>bewerkingslaag ''{0}''.</html>"
 msgstr[1] ""
 "<html>Geen van de geselecteerde objecten is beschikbaar in de "
-"huidige<br>bewerkingslaag''{0}''.</html>"
+"huidige<br>bewerkingslaag ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -9038,9 +9127,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
 msgid "Zoom to in layer"
-msgstr "Inzoomen in laag"
+msgstr "Inzoomen op laag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding objects in the current data layer"
-msgstr "Zoom naar de overeenkomende objecten in de huidige gegevenslaag"
+msgstr "Zoom in op de overeenkomende objecten in de huidige gegevenslaag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
@@ -9055,13 +9144,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463
 msgid "Download now"
-msgstr "Nu afhalen"
+msgstr "Nu downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download the changeset content"
-msgstr "Wijzigingensetinhoud downloaden"
+msgstr "Inhoud van wijzigingenset downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr "Aangemaakt"
+msgstr "Gemaakt"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
@@ -9119,4 +9208,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" />
@@ -9172,8 +9266,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" />
@@ -9958,5 +10048,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
@@ -9967,179 +10057,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
@@ -10158,5 +10249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr "Open/Gesloten:"
+msgstr "Geopend/Gesloten:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
@@ -10166,5 +10257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
 msgid "Created on:"
-msgstr "Aangemaakt op:"
+msgstr "Gemaakt op:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
@@ -10175,9 +10266,10 @@
 msgid "Remove the changeset in the detail view panel from the local cache"
 msgstr ""
-"Verwijder de wijzigingenset in het detailoverzichtspaneel van de lokale cache"
+"Verwijder de wijzigingenset in het venster voor overzicht van details van de "
+"lokale cache"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
 msgid "Update the changeset from the OSM server"
-msgstr "Werk de wijzigingenset bij vanaf de OSM-server"
+msgstr "Werk de wijzigingenset bij vanaf de server van OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
@@ -10187,5 +10279,5 @@
 msgstr ""
 "Selecteer de primitieven in de inhoud van deze wijzigingenset in de huidige "
-"datalaag"
+"gegevenslaag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -10204,5 +10296,5 @@
 "layer"
 msgstr ""
-"Zoom naar de objecten in de inhoud van deze wijzigingenset in de huidige "
+"Zoom in op de objecten in de inhoud van deze wijzigingenset in de huidige "
 "gegevenslaag"
 
@@ -10211,14 +10303,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr "wijzigingensets downloaden"
+msgstr "Wijzigingensets downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
 #, java-format
 msgid "{0} [incomplete]"
-msgstr "{0} [onvolledig]"
+msgstr "{0} [incompleet]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "open"
-msgstr "open"
+msgstr "geopend"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
@@ -10232,5 +10324,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changeset id"
-msgstr "Geef een wijzigingenset-ID op"
+msgstr "Voer een wijzigingenset-ID in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -10238,6 +10330,6 @@
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
-"Haal de wijzigingenset met het opgegeven id op, inclusief de "
-"wijzigingensetinhoud"
+"Haal de wijzigingenset met het opgegeven id op, inclusief de inhoud van de "
+"wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -10246,6 +10338,6 @@
 "> 0"
 msgstr ""
-"De huidige waarde is geen geldig wijzigingenset-ID. Gelieve een geheel getal "
-"> 0 in te geven"
+"De huidige waarde is geen geldige ID voor een wijzigingenset. Voer een "
+"geheel getal > 0 in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
@@ -10253,5 +10345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:76
 msgid "Please enter an integer value > 0"
-msgstr "Gelieve een geheel getal > 0 in te geven"
+msgstr "Voer een geheel getal > 0 in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
@@ -10261,5 +10353,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
-msgstr "Selecteer wijzigingensets afhankelijk van of ze open of gesloten zijn"
+msgstr ""
+"Selecteer wijzigingensets afhankelijk van of ze geopend of gesloten zijn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
@@ -10267,5 +10360,5 @@
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
-"Selecteer wijzigingensets op basis van de datum/tijd dat ze gecreëerd of "
+"Selecteer wijzigingensets op basis van de datum/tijd dat ze gemaakt of "
 "afgesloten werden"
 
@@ -10273,18 +10366,18 @@
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
-"Selecteer enkel wijzigingensets die betrkking hebben op een specifieke "
+"Selecteer alleen wijzigingensets die betrekking hebben op een specifieke "
 "omvattende rechthoek"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr "Zoek enkel in open wijzigingensets"
+msgstr "Zoek alleen in geopende wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr "Zoek enkel in afgesloten wijzigingensets"
+msgstr "Zoek alleen in afgesloten wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr "Zoek zowel in open als afgesloten wijzigingensets"
+msgstr "Zoek zowel in geopende als afgesloten wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
@@ -10299,10 +10392,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:501
 msgid "Only changesets owned by myself"
-msgstr "Enkel wijzigingensets waarvan ikzelf eigenaar ben"
+msgstr "Alleen wijzigingensets waarvan ikzelf eigenaar ben"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
 msgstr ""
-"Enkel wijzigingensets waarvan de gebruiker met het opgegeven gebruikers-ID "
+"Alleen wijzigingensets waarvan de gebruiker met het opgegeven gebruikers-ID "
 "eigenaar is"
 
@@ -10310,5 +10403,5 @@
 msgid "Only changesets owned by the user with the following user name"
 msgstr ""
-"Enkel wijzigingensets waarvan de gebruiker met de opgegeven gebruikersnaam "
+"Alleen wijzigingensets waarvan de gebruiker met de volgende gebruikersnaam "
 "eigenaar is"
 
@@ -10318,4 +10411,6 @@
 "anonymous user)"
 msgstr ""
+"Alleen wijzigingensets waarvan ikzelf eigenaar ben (uitgeschakeld. JOSM "
+"wordt momenteel uitgevoerd door een anonieme gebruiker)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -10324,11 +10419,11 @@
 "is anonymous"
 msgstr ""
-"De wijzigingensetaanvraag kan niet beperkt worden tot de huidige gebruiker, "
-"aangezien de huidige gebruiker anoniem is"
+"Kan de aanvraag voor de wijzigingenset niet beperken tot de huidige "
+"gebruiker, omdat de huidige gebruiker anoniem is"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Huidige waarde ''{0}'' als gebruikers-ID is niet geldig"
+msgstr "Huidige waarde ''{0}'' is niet geldig als gebruikers-ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
@@ -10336,18 +10431,18 @@
 msgid "Cannot restrict the changeset query to the user name ''{0}''"
 msgstr ""
-"De wijzigingensetaanvraag kan niet tot de volgende gebruikersnaam ''{0}'' "
-"beperkt worden"
+"Kan de aanvraag voor de wijzigingenset niet beperken tot de volgende "
+"gebruikersnaam ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
-msgstr "Gelieve een geldig gebruikers-ID op te geven"
+msgstr "Voer een geldige gebruikers-ID in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
-msgstr "Ongeldig gebruikers-ID"
+msgstr "Ongeldige gebruikers-ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
-msgstr "Gelieve een niet-lege gebruikersname op te geven"
+msgstr "Voer een niet-lege gebruikersnaam in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
@@ -10376,14 +10471,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
-msgstr "Gecreëerd voor - "
+msgstr "Gemaakt voor - "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
-msgstr "Enkel wijzigingensets afgesloten na de volgende datum/tijd"
+msgstr "Alleen wijzigingensets afgesloten na de volgende datum/tijd"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
 msgstr ""
-"Enkel wijzigingensets afgesloten na en aangemaakt voor een specifieke datum/"
+"Alleen wijzigingensets afgesloten na en gemaakt vóór een specifieke datum/"
 "tijd"
 
@@ -10393,6 +10488,6 @@
 "valid."
 msgstr ""
-"Wijzigingensetaanvraag kan niet opgebouwd worden met de opgegeven "
-"tijdgerelateerde beperkinen. Invoer is niet geldig."
+"Kan geen zoekopdracht voor wijzigingenset bouwen met de op tijd gebaseerde "
+"beperkingen. Invoer is niet geldig."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
@@ -10401,10 +10496,10 @@
 "specific time range.</html>"
 msgstr ""
-"<html>Geef geldige datum-/tijdwaarden op<br>om de zoekopdracht te begrenzen."
-"</html>"
+"<html>Geef geldige datum-/tijdwaarden op<br>om de zoekopdracht te beperken "
+"tot een specifiek tijdpad.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
-msgstr "Ongeldige datum/tijd-waardes"
+msgstr "Ongeldige datum/tijd-waarden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
@@ -10413,6 +10508,6 @@
 "invalid."
 msgstr ""
-"Kan de wijzigingensetaanvraag niet beperken tot een specifieke omvattende "
-"rechthoek. De invoer is ongeldig."
+"Kan de zoekopdracht voor de wijzigingenset niet beperken tot een specifieke "
+"omvattende rechthoek. Invoer is ongeldig."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -10421,7 +10516,7 @@
 "changeset query to a specific bounding box.</html>"
 msgstr ""
-"<html>Gelieve geldige waardes voor lengtegraad-/breedtegraad op te geven om "
-"<br>de wijzigingensetaanvraag tot een specifieke omvattende rechthoek te "
-"beperken.</html>"
+"<html>Voer geldige waarden voor lengte-/breedtegraad in om <br>de "
+"zoekopdracht voor de wijzigingenset tot een specifieke omvattende rechthoek "
+"te beperken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
@@ -10434,6 +10529,6 @@
 "The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
-"De huidige waarde is geen geldig gebruikers-ID. Gelieve een geheel getal > 0 "
-"in te geven"
+"De huidige waarde is geen geldige ID voor een gebruiker. Voer een geheel "
+"getal > 0 in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
@@ -10442,10 +10537,10 @@
 "empty user name.</html>"
 msgstr ""
-"<html>De huidige waarde is geen geldige gebruikersnaam.<br>Gelieve een niet-"
-"lege gebruikersnaam op te geven.</html>"
+"<html>De huidige waarde is geen geldige gebruikersnaam.<br>Voer een niet-"
+"lege gebruikersnaam in.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr "Gelieve een niet-lege gebruikersnaam op te geven"
+msgstr "Voer een niet-lege gebruikersnaam in"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
@@ -10455,5 +10550,5 @@
 "<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Gelieve een datum in te geven in het gebruikelijke formaat voor uw locatie."
+"Voer een datum in in de gebruikelijke indeling voor uw locatie."
 "<br>Voorbeeld: {0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: {3}<br>"
 
@@ -10464,6 +10559,6 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
-"Gelieve een tijd in te geven in het gebruikelijke formaat voor uw locatie."
-"<br>Voorbeeld: {0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: {3}<br>"
+"Voer een tijd in in de gebruikelijke indeling voor uw locatie.<br>Voorbeeld: "
+"{0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
@@ -10476,6 +10571,7 @@
 "include all changesets in the query.</html>"
 msgstr ""
-"<html>Aanvinken om de aanvraag te beperken tot uw eigen wijzigingensets."
-"<br>Afvinken om alle wijzigingensets in de aanvraag op te nemen.</html>"
+"<html>Selecteren om de zoekopdracht te beperken tot uw eigen wijzigingensets."
+"<br>Niet selecteren om alle wijzigingensets in de zoekopdracht op te nemen.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
@@ -10486,8 +10582,8 @@
 "max. 100 changesets.</html>"
 msgstr ""
-"<html>Gelieve één van de volgende <strong>standaardbevragingen</strong> te "
-"selecteren. Selecteer <strong>Enkel mijn wijzigingensets afhalen</strong> "
-"indien u enkel wijzigingensets wenst af te halen die uzelf aanmaakte."
-"<br>JOSM zal max. 100 wijzigingenset afhalen.</html>"
+"<html>Selecteer één van de volgende <strong>standaard zoekopdrachten</"
+"strong>. Selecteer <strong>Alleen mijn wijzigingensets downloaden</strong> "
+"indien u alleen wijzigingensets wilt downloaden die u zelf maakte."
+"<br>Onthoud dat JOSM max. 100 wijzigingensets zal downloaden.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
@@ -10500,11 +10596,10 @@
 "user name in the preferences first.</em></html>"
 msgstr ""
-"<html>Mijn openstaande wijzigingensets downloaden<br><em>Uitgeschakeld. "
-"Gelieve eerst uw OSM-gebruikersnaam in de instellingen in te geven.</em></"
-"html>"
+"<html>Mijn geopende wijzigingensets downloaden<br><em>Uitgeschakeld. Voer "
+"eerst uw gebruikersnaam voor OSM in de voorkeuren in.</em></html>>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
 msgid "<html>Download my open changesets</html>"
-msgstr "<html>Mijn openstaande wijzigingensets downloaden</html>"
+msgstr "<html>Mijn geopende wijzigingensets downloaden</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
@@ -10513,10 +10608,11 @@
 "currently no map view active.</em></html>"
 msgstr ""
-"<html>Mijn wijzigingensets in het huidige kaartzicht downloaden."
-"<br><em>Uitgeschakeld. Er is op dit moment geen kaartzich actief.</em></html>"
+"<html>Wijzigingensets in de huidige kaartweergave downloaden."
+"<br><em>Uitgeschakeld. Er is op dit moment geen kaartweergave actief.</em></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
 msgid "<html>Download changesets in the current map view</html>"
-msgstr "<html>Wijzigingensets in het huidige kaartzicht downloaden</html>"
+msgstr "<html>Wijzigingensets in de huidige kaartweergave downloaden</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -10526,6 +10622,6 @@
 "default query."
 msgstr ""
-"Opgelet: onverwachte waarde voor voorkeursinstelling ''{0}'', waarde is "
-"''{1}''. Teruggezet naar standaardaanvraag."
+"Waarschuwing: onverwachte waarde voor voorkeur ''{0}'', kreeg ''{1}''. "
+"Teruggezet naar standaard zoekopdracht."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
@@ -10537,5 +10633,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
 msgid "Download changesets using predefined queries"
-msgstr "Wijzigingensets met voorgedefinieerde opdrachten downloaden"
+msgstr "Wijzigingensets downloaden met vooraf gedefinieerde zoekopdrachten"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
@@ -10545,5 +10641,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
 msgid "Query changesets from a server URL"
-msgstr "Wijzigingensets van een server-URL opvragen"
+msgstr "Zoekopdracht voor wijzigingensets van een server-URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
@@ -10555,39 +10651,40 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
 msgid "Use a custom changeset query"
-msgstr "Gebruikmaken van een eigen wijzigingensetaanvraag"
+msgstr "Gebruikmaken van een eigen zoekopdracht voor wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr "Wijzigingensets aanvragen"
+msgstr "Zoekopdracht voor wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr "Wijzigingensets aanvragen en downloaden"
+msgstr "Zoekopdracht en downloaden wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr "Gelieve eerst een geldige wijzigingensetaanvraag-URL op te geven."
+msgstr ""
+"Voer eerst een geldige URL voor de zoekopdracht van de wijzigingenset in."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr "Ongeldige wijzigingensetaanvraag-URL"
+msgstr "Ongeldige URL voor zoekopdracht van wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
 msgstr ""
-"Close het dialoogvenster en breek het aanvragen van de wijzigingensets af"
+"Sluit het dialoogvenster en breek de zoekopdracht van de wijzigingensets af"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
 msgid "Querying and downloading changesets"
-msgstr "Wijzigingensets aanvragen en downloaden"
+msgstr "Zoekopdrachten en downloaden wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr "Gebruikers-ID voor huidige user bepalen..."
+msgstr "Gebruikers-ID voor huidige gebruiker bepalen..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr "Wijzigingensets aanvragen en downloaden..."
+msgstr "Zoekopdracht en downloaden wijzigingensets ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
@@ -10598,6 +10695,5 @@
 msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
 msgstr ""
-"Gelieve een URL in te voeren of te plakken om wijzigingensets uit de OSM API "
-"op te verkrijgen."
+"Voer een URL in of plak die om wijzigingensets uit de OSM API op te halen."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
@@ -10611,32 +10707,33 @@
 "regardless of the host, port and path of the URL entered below."
 msgstr ""
-"Merk op dat wijzigingensetaanvragen op dit moment altijd doorgegeven worden "
-"naar ''{0}'', ongeacht de host, port en pad van de hieronder opgegeven URL."
+"Onthoud dat zoekopdrachten voor wijzigingenset op dit moment altijd worden "
+"doorgegeven aan ''{0}'', ongeacht de host, poort en pad van de hieronder "
+"opgegeven URL."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr "Deze wijzigingensetaanvraag-URL is ongeldig"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174
+msgstr "Deze URL voor de zoekopdracht voor wijzigingenset is ongeldig"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:180
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../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."
 msgid_plural "This will change up to {0} objects."
 msgstr[0] "Dit zal {0} object wijzigen."
-msgstr[1] "Dit zal {0} objecten wijzigen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208
+msgstr[1] "Dit verandert maximaal {0} objecten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214
 msgid "An empty value deletes the tag."
-msgstr "Een lege waarde wist de tag."
-
-#: ../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
+msgstr "Een lege waarde verwijdert de tag."
+
+#: ../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
@@ -10648,19 +10745,19 @@
 msgstr "<verschillend>"
 
-#: ../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?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
+msgstr[0] "Waarde wijzigen?"
+msgstr[1] "Waarden wijzigen?"
+
+#: ../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
+msgstr "Sleutel overschrijven"
+
+#: ../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
+msgstr "Vervangen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:326
 #, java-format
 msgid ""
@@ -10668,47 +10765,49 @@
 "The new key is already used, overwrite values?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356
+"U wijzigde de sleutel van ''{0}'' naar ''{1}''.\n"
+"De nieuwe sleutel is al gebruikt, waarden overschrijven?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336
 #, java-format
 msgid "Change properties of up to {0} object"
 msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Eigenschappen van {0} object aanpassen"
-msgstr[1] "Eigenschappen van {0} objecten aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411
+msgstr[0] "Eigenschappen van maximaal {0} object aanpassen"
+msgstr[1] "Eigenschappen van maximaal {0} objecten aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:417
 #, java-format
 msgid "This will change up to {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] "Dit verandert {0} object."
-msgstr[1] "Dit verandert {0} objecten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413
+msgstr[0] "Dit verandert maximaal {0} object."
+msgstr[1] "Dit verandert maximaal {0} objecten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:419
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../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 "Selecteer een waarde"
 
-#: ../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
+msgstr "Waarde toevoegen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:554
 msgid "Please select the objects you want to change properties for."
 msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../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 "Eigenschappen/Lidmaatschappen"
 
-#: ../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 "Eigenschappen voor geselecteerde objecten."
 
 #. 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"
@@ -10717,63 +10816,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 "Positie"
 
-#: ../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 "Eigenschappen: {0} / Leden: {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 "Eigenschappen / Leden"
 
-#: ../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 "Relatie wijzigen"
 
-#: ../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 "Uit relatie verwijderen"
 
-#: ../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 "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../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 "De geselecteerde sleutel in alle objecten verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
+msgstr "Verwijder de geselecteerde sleutel uit alle objecten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1058
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../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 "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1091
+msgstr "Voeg een nieuwe sleutel/waarde aan alle objecten toe"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101
 msgid "Edit the value of the selected key for all objects"
-msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1122
+msgstr "Bewerk de waarde van de geselecteerde sleutel voor alle objecten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1132
 msgid "Go to OSM wiki for tag help (F1)"
-msgstr "Ga naar  OSM wiki voor help over tags (F1)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1123
+msgstr "Ga naar de wiki van OSM  voor hulp over tags (F1)"
+
+#: ../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 "Browser starten met wiki-hulp voor het geselecteerde object"
 
-#: ../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 "Selecteer relation in main selection."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1251
+msgstr "Selecteer relatie in hoofdselectie."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
 msgid "Select the members of selected relation"
+msgstr "Selecteer de leden van de geselecteerde relatie"
+
+#: ../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 ""
 
@@ -10781,21 +10904,22 @@
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
-"Bewerk de relatie waarnaar het momenteel geselecteerde relatielid verwijst."
+"Bewerk de relatie waarnaar het momenteel geselecteerde lid van de relatie "
+"verwijst."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:218
 msgid "Download all child relations (recursively)"
-msgstr "Afhalen alle kindrelaties (recursief)"
+msgstr "Downloaden van alle kind-relaties (recursief)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
 msgid "Download All Children"
-msgstr "Alle Kinderen Afhalen"
+msgstr "Alle kinderen downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:239
 msgid "Download selected relations"
-msgstr "Geselecteerde relaties afhalen"
+msgstr "Downloaden van geselecteerde relaties"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
 msgid "Download Selected Children"
-msgstr "Geselecteerde kinderen afhalen"
+msgstr "Downloaden van geselecteerde kinderen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:288
@@ -10805,5 +10929,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:66
 msgid "Download relation members"
-msgstr "Relatieleden afhalen"
+msgstr "Downloaden van leden van relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
@@ -10822,10 +10946,10 @@
 "loaded</html>"
 msgstr ""
-"<html>De kindrelatie<br/>{0}<br/>is verwijderd op de server. Zij kan niet "
+"<html>De kind-relatie<br/>{0}<br/>is verwijderd op de server. Zij kan niet "
 "worden geladen</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
 msgid "Relation is deleted"
-msgstr "Relatie is gewist"
+msgstr "Relatie is verwijderd"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:399
@@ -10833,5 +10957,5 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr "Afhalen van relatie {0}"
+msgstr "Downloaden van relatie {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:418
@@ -10846,4 +10970,6 @@
 msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
+"Waarschuwing: Uitzondering negeren omdat taak is geannuleerd.. Uitzondering: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:94
@@ -10851,6 +10977,6 @@
 msgid "Downloading {0} incomplete object"
 msgid_plural "Downloading {0} incomplete objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Downloaden van {0} incompleet object"
+msgstr[1] "Downloaden van {0} incomplete objecten"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100
@@ -10859,6 +10985,6 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "Afhalen van {0} onvolledig kind van relatie ''{1}''"
-msgstr[1] "Afhalen van {0} onvolledige kinderen van relatie ''{1}''"
+msgstr[0] "Downloaden van {0} incompleet kind van relatie ''{1}''"
+msgstr[1] "Downloaden van {0} incomplete kinderen van relatie ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:106
@@ -10866,15 +10992,15 @@
 msgid "Downloading {0} incomplete child of {1} parent relations"
 msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Downloaden van {0} incompleet kind van {1} ouder-relaties"
+msgstr[1] "Downloaden van {0} incomplete kinderen van {1} ouder-relaties"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
-msgstr "Afhalen van relaties"
+msgstr "Downloaden van relaties"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr "({0}/{1}): Afhalen van relatie ''{2}''..."
+msgstr "({0}/{1}): Downloaden van relatie ''{2}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:170
@@ -10885,9 +11011,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:180
 msgid "Parent Relations"
-msgstr "Ouderrelaties"
+msgstr "Ouder-relaties"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
 msgid "Child Relations"
-msgstr "Kindrelaties"
+msgstr "Kind-relaties"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:313
@@ -10898,5 +11024,6 @@
 msgid "Enter a role and apply it to the selected relation members"
 msgstr ""
-"Geef een rol op om deze toe op de geselecteerde relatieleden toe te passen"
+"Voer een rol in om deze op de geselecteerde leden van de relatie toe te "
+"passen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:599
@@ -10906,7 +11033,7 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
-"<html>Er is minstens één lid in deze relatie dat<br>naar de relatie zelf "
-"terugverwijst.<br>Dit zorgt voor circulaire afhankelijkheden en wordt "
-"afgeraden.<br>Wenst u door te gaan met circulaire afhankelijkheden?</html>"
+"<html>Er is minstens één lid in deze relatie dat verwijst<br>naar de relatie "
+"zelf.<br>Dit zorgt voor een cirkelverwijzing en wordt afgeraden.<br>Wilt u "
+"doorgaan met cirkelverwijzingen?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
@@ -10926,11 +11053,11 @@
 "html>"
 msgstr ""
-"<html>Deze relatie heeft reeds één of meer leden die refereren aan<br/>het "
-"object \"{0}\"<br/><br/>Wilt u werkelijk een nog een ander relatielid "
-"toevoegen?</html>"
+"<html>Deze relatie heeft reeds één of meer leden die verwijzen naar<br/>het "
+"object \"{0}\"<br/><br/>Wilt u werkelijk een nog een ander lid van de "
+"relatie toevoegen?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:679
 msgid "Multiple members referring to same object."
-msgstr "Meerdere leden refereren aan hetzelfde object."
+msgstr "Meerdere leden verwijzen naar hetzelfde object."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
@@ -10941,12 +11068,12 @@
 "''{0}''.</html>"
 msgstr ""
-"<html>U tracht een relatie aan zichzelf toe te voegen.<br><br>Dit creëert "
-"circulaire referenties en wordt daarom afgeraden.<br>Relatie ''{0}'' werd "
-"niet toegevoegd.</html>"
+"<html>U probeert een relatie aan zichzelf toe te voegen.<br><br>Dit maakt "
+"cirkelverwijzingen en wordt daarom afgeraden.<br>Relatie ''{0}'' "
+"overgeslagen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:738
 msgid "Add all objects selected in the current dataset before the first member"
 msgstr ""
-"Alle geselecteerde objecten in de huidige gegevensset toevoegen voor het "
+"Voeg alle geselecteerde objecten in de huidige gegevensset toe vóór het "
 "eerste lid"
 
@@ -10954,5 +11081,5 @@
 msgid "Add all objects selected in the current dataset after the last member"
 msgstr ""
-"Alle geselecteerde objecten in de huidige gegevensset toevoegen na het "
+"Voeg alle geselecteerde objecten in de huidige gegevensset toe na het "
 "laatste lid"
 
@@ -10962,6 +11089,6 @@
 "member"
 msgstr ""
-"Alle geselecteerde objecten in de huidige gegevensset toevoegen voor het "
-"eerste lid"
+"Voeg alle geselecteerde objecten in de huidige gegevensset toe vóór het "
+"eerste geselecteerde lid"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:825
@@ -10970,5 +11097,5 @@
 "member"
 msgstr ""
-"Alle geselecteerde objecten in de huidige gegevensset toevoegen na het "
+"Voeg alle geselecteerde objecten in de huidige gegevensset toe na het "
 "laatste geselecteerde lid"
 
@@ -10976,10 +11103,10 @@
 msgid "Remove all members referring to one of the selected objects"
 msgstr ""
-"Alle leden die refereren aan één van de geselecteerde objecten verwijderen."
+"Verwijder alle leden die verwijzen naar één van de geselecteerde objecten."
 
 #. putValue(NAME, tr("Remove Selected"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
 msgid "Relation Editor: Remove Selected"
-msgstr "Relatiebewerkvenster: Geselecteerde Verwijderen"
+msgstr "Relatie bewerken: Verwijder geselecteerde"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
@@ -10987,5 +11114,6 @@
 msgid "Select relation members which refer to objects in the current selection"
 msgstr ""
-"Relatieleden selecteren die refereren aan objecten in de huidige selectie"
+"Selecteer leden van de relatie die verwijzen naar objecten in de huidige "
+"selectie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
@@ -10994,13 +11122,14 @@
 "Select relation members which refer to {0} objects in the current selection"
 msgstr ""
-"Relatieleden selecteren die refereren aan {0} objecten in de huidige selectie"
+"Selecteer leden van de relatie die verwijzen naar {0} objecten in de huidige "
+"selectie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Select objects for selected relation members"
-msgstr "Objecten voor de geselecteerde relatieleden selecteren"
+msgstr "Selecteer objecten voor de geselecteerde leden van de relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Sort the relation members"
-msgstr "De relatieleden sorteren"
+msgstr "De leden van de relatie sorteren"
 
 #. JButton
@@ -11014,9 +11143,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Relation Editor: Sort"
-msgstr "Relatiebewerkvenster: Sorteren"
+msgstr "Relatie bewerken: Sorteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
 msgid "Reverse the order of the relation members"
-msgstr "Volgorde van relatieleden omkeren"
+msgstr "Volgorde van leden van de relatie omkeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:973
@@ -11026,36 +11155,36 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:974
 msgid "Relation Editor: Reverse"
-msgstr "Relatiebewerkvenster: Omkeren"
+msgstr "Relatie bewerken: Omkeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:994
 msgid "Move the currently selected members up"
-msgstr "De geselecteerde leden omhoog verplaatsen"
+msgstr "De huidige geselecteerde leden omhoog verplaatsen"
 
 #. putValue(NAME, tr("Move Up"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:997
 msgid "Relation Editor: Move Up"
-msgstr "Relatiebewerkvenster: Omhoog verplaatsen"
+msgstr "Relatie bewerken: Omhoog verplaatsen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1013
 msgid "Move the currently selected members down"
-msgstr "De geselecteerde leden omlaag verplaatsen"
+msgstr "De huidige geselecteerde leden omlaag verplaatsen"
 
 #. putValue(NAME, tr("Move Down"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1016
 msgid "Relation Editor: Move Down"
-msgstr "Relatiebewerkvenster: Omlaag verplaatsen"
+msgstr "Relatie bewerken: Omlaag verplaatsen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
 msgid "Remove the currently selected members from this relation"
-msgstr "De geselecteerde leden uit de relatie verwijderen"
+msgstr "De huidige geselecteerde leden uit de relatie verwijderen"
 
 #. putValue(NAME, tr("Remove"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
 msgid "Relation Editor: Remove"
-msgstr "Relatiebewerkvenster: Verwijderen"
+msgstr "Relatie bewerken: Verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
 msgid "Delete the currently edited relation"
-msgstr "De relatie die op dit moment bewerkt wordt verwijderen"
+msgstr "Verwijder de huidige bewerkte relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
@@ -11065,16 +11194,16 @@
 "was open. They have been removed from the relation members list."
 msgstr ""
-"Eén of meer leden van deze nieuwe relatie zijn verwijderd terwijl de "
-"relatiebewerker\n"
-"geopend was. Ze zijn verwijderd van de relatieledenlijst."
+"Eén of meer leden van deze nieuwe relatie zijn verwijderd terwijl Relatie "
+"bewerken\n"
+"geopend was.. Ze zijn verwijderd van de ledenlijst van de relatie."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1158
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:596
 msgid "Yes, create a conflict and close"
-msgstr "Ja, een conflict creëren en sluiten"
+msgstr "Ja, een conflict maken en sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1160
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Klik om een conflict te creëren en de relatiebewerker te sluiten"
+msgstr "Klik om een conflict te maken en Relatie bewerken te sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
@@ -11086,5 +11215,5 @@
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr ""
-"Klik om naar de relatie-editor terug te gaan en de relatie verder te bewerken"
+"Klik om terug te gaan naar Relatie bewerken en de relatie verder te bewerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1173
@@ -11094,7 +11223,7 @@
 "conflict and close the editor?</html>"
 msgstr ""
-"<html>Deze relatie is buiten de editor aangepast.<br>Je aanpassingen kunnen "
-"niet doorgevoerd worden.<br><br>Wil je een conflict aanmaken? (De editor "
-"wordt gesloten.)</html>"
+"<html>Deze relatie is buiten de bewerker aangepast.<br>Uw aanpassingen "
+"kunnen niet doorgevoerd worden.<br><br>Wilt u een conflict maken? (De "
+"bewerker wordt gesloten.)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
@@ -11105,22 +11234,21 @@
 "resolve this conflict first, then try again.</html>"
 msgstr ""
-"<html>Laag ''{0}'' heeft reeds een  conflict voor object<br/>''{1}''.<br/"
-">Gelieve dit conflict eerst op te lossen alvorens het opnieuw te proberen.</"
-"html>"
+"<html>Laag ''{0}'' heeft al een  conflict voor object<br/>''{1}''.<br/>Los "
+"dat conflict eerst op en probeer het dan opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:642
 msgid "Apply the current updates"
-msgstr "Pas de huidige updates toe"
+msgstr "Pas de huidige bijwerkingen toe"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:685
 msgid "Apply the updates and close the dialog"
-msgstr "Voer de updates door en sluit het venster"
+msgstr "Voer de bijwerkingen door en sluit het dialoogvenster"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:739
 msgid "Cancel the updates and close the dialog"
-msgstr "Annuleer de updates en sluit het venster"
+msgstr "Annuleer de bijwerkingen en sluit het dialoogvenster"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
@@ -11130,5 +11258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
 msgid "Download all incomplete members"
-msgstr "Download alle ontbrekende leden"
+msgstr "Download alle incomplete leden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1304
@@ -11140,13 +11268,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1335
 msgid "Relation Editor: Download Members"
-msgstr "Relatiebewerker: Leden Downloaden"
+msgstr "Relatie bewerken: Leden downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1332
 msgid "Download selected incomplete members"
-msgstr "Download geselecteerde ontbrekende leden"
+msgstr "Downloaden van geselecteerde incomplete leden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Sets a role for the selected members"
-msgstr "Past een rol toe op de geselecteerde leden"
+msgstr "Stel een rol in voor de geselecteerde leden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
@@ -11163,9 +11291,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1385
 msgid "This is equal to deleting the roles of these objects."
-msgstr "Dit is geijk aan het verwijderen van de rollen van deze objecten."
+msgstr "Dit staat gelijk aan het verwijderen van de rollen van deze objecten."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
 msgid "Do you really want to apply the new role?"
-msgstr "Bent u zeker dat u de nieuwe rol wenst toe te passen?"
+msgstr "Weet u zeker dat u de nieuwe rol wilt toepassen?"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
@@ -11184,5 +11312,6 @@
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
-"De relatie, waar het nu geselecteerde relatielid heen verwijst, wijzigen"
+"De relatie, waar het nu geselecteerde lid van de relatie naar verwijst, "
+"wijzigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1541
@@ -11191,5 +11320,5 @@
 "current layer"
 msgstr ""
-"Leden in plakbuffer kunnen niet worden toegevoegd omdat ze geen deel "
+"Leden in de buffer Plakken kunnen niet worden toegevoegd omdat ze geen deel "
 "uitmaken van de huidige laag"
 
@@ -11203,6 +11332,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to the object the first selected member refers to"
-msgstr ""
-"Inzoomen op het object waar het eerst geselecteerde lid naartoe verwijst"
+msgstr "Inzoomen op het object waar het eerst geselecteerde lid naar verwijst"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
@@ -11222,26 +11350,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
-msgstr "Verwijzende relaties afhalen"
+msgstr "Verwijzende relaties downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:186
 #, java-format
 msgid "There were {0} conflicts during import."
-msgstr "Er waren {0} tegenstrijdigheden tijdens het importeren."
+msgstr "Er waren {0} conflicten tijdens het importeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62
 msgid "including immediate children of parent relations"
-msgstr "Inclusief direct kinderen van ouderrelaties"
+msgstr "Inclusief directe kinderen van ouder-relaties"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90
 msgid "Load parent relations"
-msgstr "Ouderrelaties laden"
+msgstr "Ouder-relaties laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106
 msgid "Loading parent relations"
-msgstr "Ouderrelaties  worden geladen"
+msgstr "Ouder-relaties  worden geladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139
 msgid "Edit the currently selected relation"
-msgstr "Geselecteerde relatie wijzigen"
+msgstr "Bewerk de huidige geselecteerde relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -11252,5 +11380,5 @@
 #, java-format
 msgid "Create new relation in layer ''{0}''"
-msgstr "Nieuwe relatie in laag ''{0}'' aanmaken"
+msgstr "Nieuwe relatie in laag ''{0}'' maken"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:136
@@ -11274,13 +11402,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is connected to previous relation member"
-msgstr "weg is verbonden met vorig relatielid"
+msgstr "weg is verbonden met vorig lid van de relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:83
 msgid "way is connected to next relation member"
-msgstr "weg is verbonden met volgend relatielid"
+msgstr "weg is verbonden met volgend lid van de relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:85
 msgid "way is not connected to previous or next relation member"
-msgstr "weg is niet verbonden met vorig of volgend relatielid"
+msgstr "weg is niet verbonden met vorig of volgend lid van de relatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
@@ -11290,5 +11418,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
-msgstr "<html>Er is momenteel geen afhaalgebied geselecteerd.</html>"
+msgstr ""
+"<html>Er is momenteel geen gebied om te downloaden geselecteerd.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
@@ -11297,117 +11426,118 @@
 "maxlat): </html>"
 msgstr ""
-"<html><strong>Huidig afhaalgebied</strong> (minlon, minlat, maxlon, maxlat): "
-"</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
+"<html><strong>Huidig gebied om te downloaden</strong> (minlon, minlat, "
+"maxlon, maxlat): </html>"
+
+#: ../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 "Bladwijzer aanmaken"
 
-#: ../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 "Bladwijzer aanmaken voor het momenteel geselecteerde afhaalgebied"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
+msgstr ""
+"Bladwijzer aanmaken voor het momenteel geselecteerde gebied om te downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
-"Er is, op dit moment, geen afhaalgebied geselecteerd. Gelieve eerst een "
-"gebied aan te duiden."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
+"Momenteel is er geen gebied om te downloaden geselecteerd. Selecteer eerst "
+"een gebied."
+
+#: ../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 ""
-"Gelieve een naam voor de bladwijzer voor het aangeduide gebied in te geven."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
+msgstr "Voer een naam voor de bladwijzer in voor het te downloaden gebied."
+
+#: ../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 "Naam voor locatie"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
+msgstr "Naam van locatie"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
 msgid "Remove the currently selected bookmarks"
-msgstr "De geselecteerde bladwijzers verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
+msgstr "De huidige geselecteerde bladwijzers verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
 msgid "Rename the currently selected bookmark"
-msgstr "De geselecteerde bladwijzers herbenoemen"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+msgstr "De huidige geselecteerde bladwijzers hernoemen"
+
+#: ../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 "Tekstgebied leegmaken"
 
-#: ../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 "
 "area)"
 msgstr ""
-"URL van www.openstreetmap.org (je kunt hier een URL plakken om het gebied te "
+"URL van www.openstreetmap.org (u kunt hier een URL plakken om het gebied te "
 "downloaden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153
 msgid "Bounding Box"
 msgstr "Omvattend gebied"
 
-#: ../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
 #, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "De letterreeks ''{0}'' kan niet worden omgezet naar een geldig getal."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230
+msgstr "De tekenreeks ''{0}'' is geen geldige waarde voor Double."
+
+#: ../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 "Waarde voor breedtegraad lager dan [-90,90] wordt vereist."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262
+msgstr "Waarde voor breedtegraad in bereik [-90,90] vereist."
+
+#: ../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 "Een waarde voor de lengtegraad in het bereik [-180,180] is benodigd."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301
+msgstr "Waarde voor lengtegraad in bereik [-180,180] vereist."
+
+#: ../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"
-msgstr "URL-adres uit klembord plakken"
+msgstr "URL-adres vanaf klembord plakken"
 
 #. adding the download tasks
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
 msgid "Data Sources and Types:"
-msgstr "Databronnen en types:"
+msgstr "Gegevensbronnen en types:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92
 msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-gegevens"
+msgstr "gegevens van OpenStreetMap"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
 msgid "Select to download OSM data in the selected download area."
-msgstr "Aanvinken om OSM-gegevens af te halen in het geselecteerde gebied"
+msgstr ""
+"Selecteren om gegevens van OSM voor het geselecteerde gebied te downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:95
 msgid "Raw GPS data"
-msgstr "Rauwe GPS-gegevens"
+msgstr "Ruwe GPS-gegevens"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:96
 msgid "Select to download GPS traces in the selected download area."
-msgstr "Aanvinken om GPS-sporen af te halen in het geselecteerde gebied"
+msgstr "Selecteren om GPS-sporen voor het geselecteerde gebied te downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:127
@@ -11420,7 +11550,7 @@
 "into the currently active data layer.</html>"
 msgstr ""
-"<html>Aanvinken om afgehaalde gegevens in een nieuwe laag onderbrengen."
-"<br>Afvinken om afgehaalde gegevens in de momenteel actieve laag bij te "
-"plaatsen.</html>"
+"<html>Selecteren om gedownloade gegevens in een nieuwe gegevenslaag onder te "
+"brengen.<br>Niet selecteren om gedownloade gegevens in de huidige actieve "
+"laag te plaatsen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:200
@@ -11430,5 +11560,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:203
 msgid "Download area too large; will probably be rejected by server"
-msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
+msgstr ""
+"Gebied te groot om te downloaden; zal waarschijnlijk worden afgewezen door "
+"de server"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206
@@ -11440,14 +11572,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:359
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Klik om het dialoogvenster te sluiten en om het afhalen af te breken"
+msgstr ""
+"Klik om het dialoogvenster te sluiten en om het downloaden af te breken"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
 msgid "Click to download the currently selected area"
-msgstr "Klik om het momenteel geselcteerde gebied te downloaden"
+msgstr "Klik om het huidige geselecteerde gebied te downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:383
 msgid "Please select a download area first."
-msgstr ""
-"Gelieve eerst een gebied t selecteren waarvoor u gegevens wenst af te halen"
+msgstr "Selecteer eerst een gebied waarvan u gegevens wilt downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
@@ -11457,7 +11589,7 @@
 "<br>Please choose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
-"<html>Noch <strong>{0}</strong> noch <strong>{1}</strong> is aangezet.<br/> "
-"Kies alstublieft ervoor om ofwel OSM-gegevens te downloaden of GPX-gegevens "
-"of allebei.</html>"
+"<html>Noch <strong>{0}</strong> noch <strong>{1}</strong> zijn ingeschakeld."
+"<br/> Kies ervoor om óf gegevens van OSM te downloaden óf GPX-gegevens of "
+"allebei.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
@@ -11470,24 +11602,15 @@
 msgstr "Grenzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
-msgid "Near"
-msgstr "Nabij"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
-msgctxt "placeselection"
-msgid "Zoom"
-msgstr "Inzoomen"
-
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102
 msgid "Choose the server for searching:"
-msgstr "Kies een server om te doorzoeken:"
+msgstr "Kies de server om te doorzoeken:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:110
 msgid "Enter a place name to search for:"
-msgstr "Voer een plaats in om naar te zoeken:"
+msgstr "Voer een plaatsnaam in om naar te zoeken:"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:113
 msgid "Enter a place name to search for"
-msgstr "Geef een plaatsnaam op om naar te zoeken"
+msgstr "Voer een plaatsnaam in om naar te zoeken"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:149
@@ -11498,13 +11621,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
 msgid "Null pointer exception, possibly some missing tags."
-msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags."
+msgstr "Null pointer-uitzondering, mogelijk ontbreken er enkele tags."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:287
 msgid "Search ..."
-msgstr "Zoek …"
+msgstr "Zoeken ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:289
 msgid "Click to start searching for places"
-msgstr "Aanvinken om te beginnen met zoeken naar plaatsen"
+msgstr "Klik om te beginnen met zoeken naar plaatsen"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:329
@@ -11523,7 +11646,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"
@@ -11539,12 +11667,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
@@ -11570,5 +11699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:180
 msgid "JOSM Help Browser"
-msgstr "JOSM Help-Browser"
+msgstr "JOSM Help-browser"
 
 #. i18n: do not translate "warning-header" and "warning-body"
@@ -11584,11 +11713,11 @@
 "a>.</p></html>"
 msgstr ""
-"<html><p class=\"warning-header\">Helpinhoud voor dit helponderwerp "
-"ontbreekt</p><p class=\"warning-body\">Helpinhoud voor het helponderwerp "
-"<strong>{0}</strong> is nog niet beschikbaar. Het ontbreekt zowel in uw "
-"eigen taal ({1}) als in het Engels.<br/><br/>Help alstublieft JOSM te "
-"verbeteren en vul de ontbrekende informatie aan. U kunt zowel het<a href="
-"\"{2}\">helponderwerp in uw eigen taal ({1})</a>bewerken als het<a href="
-"\"{3}\">helponderwerp in het Engels</a>.</p></html>"
+"<html><p class=\"warning-header\">Help-inhoud voor dit onderwerp in Help "
+"ontbreekt</p><p class=\"warning-body\">Help-inhoud voor het onderwerp "
+"<strong>{0}</strong> in de Help is nog niet beschikbaar. Het ontbreekt zowel "
+"in uw eigen taal ({1}) als in het Engels.<br/><br/>Help alstublieft JOSM te "
+"verbeteren en vul de ontbrekende informatie aan. U kunt zowel het onderwerp "
+"voor de Help <a href=\"{2}\"> in uw eigen taal ({1})</a> bewerken als het "
+"onderwerp voor de Help <a href=\"{3}\"> in het Engels</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253
@@ -11600,8 +11729,8 @@
 "p></html>"
 msgstr ""
-"<html><p class=\"error-header\">Fout bij het ophalen van hulpinformatie</"
-"p><p class=\"error-body\">De inhoud voor het hulponderdeel <strong>{0}</"
-"strong> kon niet worden ingeladen. Dit is de (onvertaalde) foutboodschap:"
-"<br><tt>{1}</tt></p></html>"
+"<html><p class=\"error-header\">Fout bij het ophalen van de informatie uit "
+"de Help</p><p class=\"error-body\">De inhoud voor het onderwerp in de Help "
+"<strong>{0}</strong> kon niet worden geladen. De foutmelding is (niet "
+"vertaald):<br><tt>{1}</tt></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:352
@@ -11611,21 +11740,21 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
-"<html>Het openen van de hulptekst op webpagina {0} is mislukt.<br>Dit ligt "
-"waarschijnlijk aan een netwerkprobleem, gelieve<br>uw internetverbinding na "
-"te kijken</html>"
+"<html>Het openen van de tekst van de Help op webpagina {0} is mislukt."
+"<br>Dit ligt waarschijnlijk aan een netwerkprobleem, controleer<br>uw "
+"verbinding met het internet</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:357
 msgid "Failed to open URL"
-msgstr "Het openen van de webpagina is mislukt"
+msgstr "Het openen van de URL is mislukt"
 
 #. putValue(NAME, tr("Open in Browser"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:390
 msgid "Open the current help page in an external browser"
-msgstr "De huidige hulppagina openen in een extern browservenster"
+msgstr "De huidige pagina van de Help openen in een extern browservenster"
 
 #. putValue(NAME, tr("Edit"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:402
 msgid "Edit the current help page"
-msgstr "De huidige hulppagina bewerken"
+msgstr "De huidige pagina van de Help bewerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:412
@@ -11635,15 +11764,17 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
-"<html>De huidige URL <tt>{0}</tt><br/>is een externe URL. Het bewerken is "
-"alleen mogelijk voor<br/>helponderwerpen op de helpserver <tt>{1}</tt>.</"
-"html>"
+"<html>De huidige URL <tt>{0}</tt><br/>is een externe URL. Bewerken van "
+"onderwerpen van de Help is alleen mogelijk<br/>op de server van de Help <tt>"
+"{1}</tt>.</html>"
 
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:434
 msgid "Reload the current help page"
-msgstr "Huidige helppagina herladen"
+msgstr "Huidige pagina van de Help herladen"
 
 #. 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"
@@ -11658,18 +11789,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:485
 msgid "Go to the JOSM help home page"
-msgstr "Naar de JOSM help-homepage gaan."
+msgstr "Naar de thuispagina van JOSM Help gaan."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:516
 #, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Waarschuwing: slechte locatie in het HTML-document. Uitzondering: {0}"
+msgstr "Waarschuwing: slechte locatie in HTML-document. Uitzondering was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:566
 msgid "Failed to open help page. The target URL is empty."
-msgstr "Kan de helppagina niet openen. De doel-URL is leeg."
+msgstr "Kan de pagina voor Help niet openen. De URL voor het doel is leeg."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:567
 msgid "Failed to open help page"
-msgstr "Kan de help-pagina niet openen."
+msgstr "Kan de pagina voor Help niet openen."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:180
@@ -11681,5 +11812,5 @@
 msgstr "Lengtegraad: "
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138
 msgid "Coordinates"
 msgstr "Coördinaten"
@@ -11688,50 +11819,48 @@
 #, java-format
 msgid "History for node {0}"
-msgstr "Historiek voor knooppunt {0}"
+msgstr "Historie voor knoop {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:52
 #, java-format
 msgid "History for way {0}"
-msgstr "Historiek voor weg {0}"
+msgstr "Historie voor weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:53
 #, java-format
 msgid "History for relation {0}"
-msgstr "Historiek voor relatie {0}"
+msgstr "Historie voor relatie {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:156
 msgid "Reload the history from the server"
-msgstr "Historiek opnieuw laden van de server"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
+msgstr "Historie opnieuw laden vanaf de server"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
-"Historiek is nog niet geïnitialiseerd. Er kon geen referentieprimitief "
-"worden ingesteld."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
+"Historie nog niet geïnitialiseerd. Instellen verwijzingsprimitief mislukt."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:285
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:315
 #, java-format
 msgid ""
 "Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
-"Er kon geen referentie worden ingesteld. Het referentie-ID {0} komt niet "
-"overeen met historiek-ID {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282
+"Instellen verwijzing mislukt. Verwijzings-ID {0} komt niet overeen met "
+"historie-ID {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:288
 #, java-format
 msgid ""
 "Failed to set reference. Reference version {0} not available in history."
 msgstr ""
-"Kan de de verwijzing niet instellen. Verwijzingsversie {0} is niet "
-"beschikbaar in de geschiedenis."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
+"Instellen verwijzing mislukt. Verwijzingsversie {0} niet beschikbaar in "
+"historie."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:313
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
-"Geschiedenis is nog niet geïnitialiseerd. Instellen van de huidige primitief "
-"is mislukt."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
+"Historie nog niet geïnitialiseerd. Instellen huidige primitief mislukt."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:318
 #, java-format
 msgid ""
@@ -11739,26 +11868,26 @@
 "history."
 msgstr ""
-"Instellen van de huidige primitief is mislukt. Huidige versie {0} is niet "
-"beschikbaar in de geschiedenis."
+"Instellen huidige primitief mislukt. Huidige versie {0} niet beschikbaar in "
+"historie."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 msgid "Load history"
-msgstr "Historiek laden"
+msgstr "Historie laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
 #, java-format
 msgid "Loading history for node {0}"
-msgstr "Historiek voor knooppunt {0} wordt geladen"
+msgstr "Historie voor knoop {0} wordt geladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
-msgstr "Historiek voor weg {0} wordt geladen"
+msgstr "Historie voor weg {0} wordt geladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr "Historiek voor relatie {0} wordt geladen"
+msgstr "Historie voor relatie {0} wordt geladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -11766,17 +11895,17 @@
 #, java-format
 msgid "Node {0}"
-msgstr "Knooppunt {0}"
+msgstr "Knoop {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr "Inzoomen naar knooppunt"
+msgstr "Inzoomen op knoop"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
 msgid "Zoom to this node in the current data layer"
-msgstr "Zoom naar dit knooppunt in de huidige datalaag"
+msgstr "Zoom in op deze knoop in de huidige gegevenslaag"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
 msgid "Open a history browser with the history of this node"
-msgstr "Open een geschiedenisverkenner met de geschiedenis van dit knooppunt."
+msgstr "Open een geschiedenisverkenner met de geschiedenis van deze knoop."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
@@ -11801,5 +11930,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:53
 msgid "Changeset:"
-msgstr ""
+msgstr "Wijzigingenset:"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:89
@@ -11815,15 +11944,15 @@
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 msgstr ""
-"<html>Versie <strong>{0}</strong> gecreëerd op <strong>{1}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
+"<html>Versie <strong>{0}</strong> gemaakt op <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:123
 msgid "Changeset info"
 msgstr "Wijzigingenset info"
 
-#: ../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 "Verkenner met informatie over de wijzigingenset starten"
 
-#: ../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}"
@@ -11838,10 +11967,10 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
-msgstr "Versie {0}, aangemaakt op {1} (door {2})"
+msgstr "Versie {0}, gemaakt op {1} (door {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:102
 #, java-format
 msgid "Version {0} in editor"
-msgstr "Versie {0} in bewerkvenster"
+msgstr "Versie {0} in bewerkingsvenster"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:104
@@ -11852,5 +11981,5 @@
 #, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr "Version {0} wordt momenteel bewerkt in gegevenslaag ''{1}''"
+msgstr "Versie {0} wordt momenteel bewerkt in gegevenslaag ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
@@ -11878,5 +12007,5 @@
 #, java-format
 msgid "Synchronize node {0} only"
-msgstr "Synchroniseer alleen node {0}"
+msgstr "Synchroniseer alleen knoop {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:92
@@ -11893,5 +12022,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:151
 msgid "Synchronize entire dataset"
-msgstr "Synchroniseer alle gegevens"
+msgstr "Synchroniseer de gehele gegevensset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:115
@@ -11906,12 +12035,12 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-"<html>Versturen <strong>mislukt</strong> omdat de server een nieuwere versie "
-"van een <br>van uw knooppunten, wegen, of relaties heeft gevonden.<br>Het "
+"<html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie "
+"van een <br>van uw knopen, wegen, of relaties heeft gevonden.<br>Het "
 "conflict is veroorzaakt door de <strong>{0}</strong> met id <strong>{1}</"
-"strong>,<br>de server heeft versie {2}, uw versie is {3}.<br><br>Klik "
-"<strong>{4}</strong> om alleen het foutieve item te synchronizeren.<br>Klik "
-"<strong>{5}</strong> om de volledige dataset met de server te synchronizeren."
-"<br>Klik <strong>{6}</strong> om af te breken, en verder te gaan met "
-"aanpassingen.<br></html>"
+"strong>,<br>de server heeft versie {2}, uw versie is {3}.<br><br>Klik op "
+"<strong>{4}</strong> om alleen het foutieve item te synchroniseren.<br>Klik "
+"op <strong>{5}</strong> om de volledige gegevensset met de server te "
+"synchroniseren.<br>Klik op <strong>{6}</strong> om af te breken en verder te "
+"gaan met bewerken.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:129
@@ -11929,9 +12058,9 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-"<html>Versturen <strong>mislukt</strong> omdat de server een nieuwere versie "
-"van een <br>van uw knooppunten, wegen of relaties heeft gevonden."
-"<br><br>Klik <strong>{0}</strong> om de volledige dataset te synchronizeren "
-"met de server.<br>Klik <strong>{1}</strong> om af te breken, en verder te "
-"gaan met aanpassingen.<br></html>"
+"<html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie "
+"van een <br>van uw knopen, wegen of relaties heeft gevonden.<br><br>Klik op "
+"<strong>{0}</strong> om de volledige gegevensset te synchroniseren met de "
+"server.<br>Klik op <strong>{1}</strong> om af te breken en verder te gaan "
+"met bewerken.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:191
@@ -11942,7 +12071,7 @@
 "again with a new or an existing open changeset.</html>"
 msgstr ""
-"<html>Versturen <strong>mislukt</strong> omdat u <br>wijzigingenset {0} "
-"heeft gebruikt, welke reeds gesloten was op {1}.<br>Gaarne opnieuw versturen "
-"met een nieuwe of bestaande open wijzigingenset.</html>"
+"<html>Uploaden <strong>mislukt</strong> omdat u <br>wijzigingenset {0} heeft "
+"gebruikt, welke reeds gesloten was op {1}.<br>Gaarne opnieuw versturen met "
+"een nieuwe of bestaande geopende wijzigingenset.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:199
@@ -11952,14 +12081,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:211
 msgid "Prepare conflict resolution"
-msgstr "Voorbereiden conflikt oplossen"
+msgstr "Voorbereiden conflict oplossen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:213
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr "Klik om alle ouders voor knooppunt {0} op te halen"
+msgstr "Klik om alle ouders voor knoop {0} te downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:219
 msgid "Click to cancel and to resume editing the map"
-msgstr "Klik om af te breken, en door te gaan met het wijzigen van de kaart"
+msgstr "Klik om af te breken en door te gaan met het bewerken van de kaart"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:223
@@ -11971,13 +12100,13 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-"<html>Versturen <strong>mislukt </strong> omdat u node {0} probeerde te "
-"verwijderen. Deze is nog in gebruik in weg {1}.<br><br>Klik <strong>{2}</"
-"strong> om alle ouder wegen op te halen van knooppunt {0}.<br>Indien nodig "
-"zal JOSM conflikten aanmaken die u kunt oplossen met behulp van het Conflikt "
-"Oplossen venster.</html>"
+"<html>Uploaden <strong>mislukt </strong> omdat u knoop {0} probeerde te "
+"verwijderen. Deze is nog in gebruik in weg {1}.<br><br>Klik op <strong>{2}</"
+"strong> om alle ouder-wegen op te halen van knoop {0}.<br>Indien nodig zal "
+"JOSM conflicten aanmaken die u kunt oplossen met behulp van het venster "
+"Conflict oplossen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:234
 msgid "Node still in use"
-msgstr "Knooppunt nog in gebruik"
+msgstr "Knoop nog steeds in gebruik"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:272
@@ -11985,5 +12114,6 @@
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon"
+msgstr ""
+"Waarschuwing: fout kop \"{0}\" komt niet overeen met een verwacht patroon"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
@@ -11993,5 +12123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
 msgid "Enter an upload comment"
-msgstr "Een uploadcommentaar invoeren"
+msgstr "Een opmerking bij uploaden invoeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -12002,5 +12132,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr "Aangemaakt op:"
+msgstr "Gemaakt op:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
@@ -12017,6 +12147,6 @@
 "the changeset after the next upload."
 msgstr ""
-"Gelieve te beslissen naar welke wijzigingenset de gegevens geüpload worden "
-"en of de wijzigingenset na de volgende upload gesloten moet worden."
+"Bepaal naar welke wijzigingenset de gegevens geüpload worden en of de "
+"wijzigingenset na de volgende upload gesloten moet worden."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:89
@@ -12034,55 +12164,55 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Upload gegevens naar een reeds bestaande en geopende wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
 msgid "Select an open changeset"
-msgstr ""
+msgstr "Selecteer een geopende wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:145
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Sluit de wijzigingenset na de upload"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:146
 msgid "Select to close the changeset after the next upload"
-msgstr ""
+msgstr "Selecteren om de wijzigingenset te sluiten na de volgende upload"
 
 #. putValue(NAME, tr("Reload"));
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:302
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Laad de lijst met uw geopende wijzigingensets van de server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:320
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Sluit de huidige geselecteerde geopende wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>Selecteer de wijzigingensets die u wilt sluiten</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
-msgstr ""
+msgstr "Wijzigingensets openen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
 msgid "Close changesets"
-msgstr ""
+msgstr "Wijzigingensets sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Sluit de geselecteerde geopende wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Annuleer het sluiten van wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
 msgid "Closing changeset"
-msgstr ""
+msgstr "Wijzigingenset aan het sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Wijzigingenset aan het sluiten {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:103
@@ -12091,20 +12221,22 @@
 "exception."
 msgstr ""
+"Waarschuwing: op voorgrond houden van dialoogvenster Persoonlijke gegevens "
+"mislukt. Beveiligingsuitzondering ontvangen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:109
 msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "Voer persoonlijke gegevens in voor OSM API"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:116
 msgid "Enter credentials for HTTP proxy"
-msgstr ""
+msgstr "Voer persoonlijke gegevens in voor HTTP proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:245
 msgid "Please enter the user name of your OSM account"
-msgstr ""
+msgstr "Voer de gebruikersnaam voor uw account voor OSM in"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:246
 msgid "Please enter the password of your OSM account"
-msgstr ""
+msgstr "Voer het wachtwoord voor uw account voor OSM in"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:248
@@ -12114,16 +12246,18 @@
 "and a valid password."
 msgstr ""
+"Authenticeren op de OSM API ''{0}'' mislukt. Voer een geldige gebruikersnaam "
+"en een geldig wachtwoord in."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:250
 msgid "Warning: The password is transferred unencrypted."
-msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd."
+msgstr "Waarschuwing: het wachtwoord wordt niet versleuteld verstuurd."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:263
 msgid "Please enter the user name for authenticating at your proxy server"
-msgstr ""
+msgstr "Voer de gebruikersnaam in voor het authenticeren bij uw proxyserver"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:264
 msgid "Please enter the password for authenticating at your proxy server"
-msgstr ""
+msgstr "Voer het wachtwoord in voor het authenticeren bij uw proxyserver"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:266
@@ -12133,4 +12267,6 @@
 "username and a valid password."
 msgstr ""
+"Authenticeren bij de HTTP proxy ''{0}'' mislukt. Voer een geldige "
+"gebruikersnaam en een geldig wachtwoord in."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:268
@@ -12139,16 +12275,18 @@
 "password may be transferred unencrypted."
 msgstr ""
+"Waarschuwing: afhankelijk van de methode voor authenticatie die de "
+"proxyserver gebruikt kan het wachtwoord niet versleuteld worden overgedragen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:334
 msgid "Authenticate"
-msgstr ""
+msgstr "Authenticeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:335
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Authenticeren met de opgegeven gebruikersnaam en wachtwoord"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:349
 msgid "Cancel authentication"
-msgstr ""
+msgstr "Authenticeren annuleren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
@@ -12159,8 +12297,12 @@
 "working."
 msgstr ""
+"Kon geen lijst van uw geopende wijzigingensets ophalen omdat<br>JOSM uw "
+"identiteit niet kent.<br>U moet kiezen om óf anoniem te werken óf u bent "
+"niet gerechtigd<br>om de identiteit te kennen van de gebruiker op wiens "
+"gezag u werkt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
 msgid "Missing user identity"
-msgstr ""
+msgstr "Ontbrekende identiteit van de gebruiker"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:120
@@ -12170,12 +12312,14 @@
 "was: {0}"
 msgstr ""
+"Waarschuwing: Ophalen van gebruikersinformatie over de huidige gebruiker van "
+"JOSM mislukt. Uitzondering was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:53
 msgid "Download objects"
-msgstr ""
+msgstr "Downloaden van objecten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:102
 msgid "Initializing nodes to download ..."
-msgstr ""
+msgstr "Initialiseren van knopen om te downloaden ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -12183,17 +12327,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1360
 msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Start een venster voor bestandsselectie om een bestand te selecteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Select filename"
-msgstr ""
+msgstr "Selecteer een bestandsnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:29
 msgid "Open Recent"
-msgstr ""
+msgstr "Open recent bestand"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:30
 msgid "List of recently opened files"
-msgstr ""
+msgstr "Lijst van recent geopende bestanden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:83
@@ -12201,9 +12345,9 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:58
 msgid "Clear"
-msgstr ""
+msgstr "Leegmaken"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:84
 msgid "Clear the list of recently opened files"
-msgstr ""
+msgstr "Maak de lijst van recent geopende bestanden leeg"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
@@ -12211,9 +12355,11 @@
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
+"Laag ''{0}'' heeft wijzigingen die zouden moeten worden geüpload naar de "
+"server."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "Laag ''{0}'' heeft geen wijzigingen die moeten worden geüpload."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
@@ -12223,22 +12369,24 @@
 "''{1}''."
 msgstr ""
+"Laag ''{0}'' heeft wijzigingen die zouden moeten worden opgeslagen naar het "
+"gekoppelde bestand ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Laag ''{0}'' heeft geen wijzigingen die moeten worden opgeslagen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Geen bestand gekoppeld aan deze laag"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
 msgid "Please select a file"
-msgstr ""
+msgstr "Selecteer een bestand"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "Laag ''{0}'' wordt niet gesteund door een bestand"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
@@ -12246,4 +12394,5 @@
 msgid "File ''{0}'' is not writable. Please enter another file name."
 msgstr ""
+"Bestand ''{0}'' kan niet worden beschreven. Voer een andere bestandsnaam in."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -12251,22 +12400,22 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Selecteren om laag ''{0}'' naar de server ''{1}'' te uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
+msgstr "Laag opslaan naar ''{0}'' ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:116
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
+msgstr "Niet-opgeslagen wijzigingen - Opslaan/Uploaden vóór afsluiten?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:122
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Niet-opgeslagen wijzigingen - Opslaan/Uploaden vóór verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:142
 msgid "Uploading and saving modified layers ..."
-msgstr ""
+msgstr "Uploaden en opslaan van gewijzigde lagen ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:197
@@ -12279,9 +12428,13 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
+"<html>{0} laag heeft nog niet-opgeloste conflicten.<br>Los ze eerst op óf "
+"negeer de aanpassingen.<br>Laag met conflicten:</html>"
 msgstr[1] ""
+"<html>{0} lagen hebben nog niet-opgeloste conflicten.<br>Los ze eerst op óf "
+"negeer de aanpassingen.<br>Lagen met conflicten:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:208
 msgid "Unsaved data and conflicts"
-msgstr ""
+msgstr "Niet-opgeslagen gegevens en conflicten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:215
@@ -12295,9 +12448,15 @@
 "html>"
 msgstr[0] ""
+"<html>{0} laag moet worden opgeslagen maar heeft geen gekoppeld bestand."
+"<br>Selecteer of een bestand voor deze laag óf annuleer de wijzigingen."
+"<br>Laag zonder bestand:</html>"
 msgstr[1] ""
+"<html>{0} lagen moeten worden opgeslagen maar hebben geen gekoppeld bestand."
+"<br>Selecteer of een bestand voor ze óf annuleer de wijzigingen.<br>Lagen "
+"zonder bestand</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:226
 msgid "Unsaved data and missing associated file"
-msgstr ""
+msgstr "Niet-opgeslagen gegevens en ontbrekende gekoppelde bestanden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:233
@@ -12312,50 +12471,64 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
+"<html>{0} laag moet worden opgeslagen maar heeft een gekoppeld "
+"bestand<br>dat niet kan worden beschreven.<br>Selecteer of een ander bestand "
+"voor deze laag óf annuleer de wijzigingen.<br>Laag met een niet te "
+"beschrijven bestand:</html>"
 msgstr[1] ""
+"<html>{0} lagen moet worden opgeslagen maar hebben een gekoppeld "
+"bestand<br>dat niet kan worden beschreven.<br>Selecteer óf een ander bestand "
+"voor elk van deze lagen óf annuleer de wijzigingen.<br>Lagen met niet te "
+"beschrijven bestanden:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:246
 msgid "Unsaved data non-writable files"
-msgstr ""
+msgstr "Niet-opgeslagen gegevens en niet te beschrijven bestanden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:293
 msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
+msgstr "Sluit dit dialoogvenster en ga door met het bewerken in JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Discard and Exit"
-msgstr "Negeer veranderingen en verlaat JOSM"
+msgstr "Annuleer veranderingen en sluit JOSM af"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:325
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
+"Sluit JOSM af zonder op te slaan. Niet-opgeslagen wijzigingen gaan verloren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:330
 msgid "Discard and Delete"
-msgstr ""
+msgstr "Annuleer veranderingen en verwijder ze"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:331
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
+"Verwijder lagen zonder op te slaan. Niet-opgeslagen wijzigingen gaan verloren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload and Exit"
-msgstr ""
+msgstr "Opslaan/Uploaden en Afsluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:357
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
+"Sluit JOSM af met opslaan. Niet-opgeslagen wijzigingen worden geüpload en/of "
+"opgeslagen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:362
 msgid "Save/Upload and Delete"
-msgstr ""
+msgstr "Opslaan/Uploaden en Verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:363
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
+"Lagen opslaan/uploaden vóór verwijderen. Niet-opgeslagen wijzigingen gaan "
+"niet verloren."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:410
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
+msgstr "Voorbereiden van laag ''{0}'' voor uploaden ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:497
@@ -12368,9 +12541,13 @@
 "canceled or have failed.</html>"
 msgstr[0] ""
+"<html>Een upload- en/of opslaan-bewerking van één laag met "
+"aanpassingen<br>werd geannuleerd of is mislukt.</html>"
 msgstr[1] ""
+"<html>Bewerkingen uploaden en/of opslaan van {0} lagen met "
+"aanpassingen<br>werden geannuleerd of zijn mislukt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Incomplete upload en/of opslaan"
 
 #. item "Highways/Streets/Motorway" combo "Layer"
@@ -12414,5 +12591,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
@@ -12424,31 +12601,31 @@
 #: 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 "laag"
+msgstr "Laag"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
 msgid "Should upload?"
-msgstr ""
+msgstr "Moet geüpload worden?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
 msgid "Should save?"
-msgstr ""
+msgstr "Moet opgeslagen worden?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:221
 msgid "Filename"
-msgstr ""
+msgstr "Bestandsnaam"
 
 #: ../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 ""
+msgstr "Uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:52
@@ -12458,69 +12635,74 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:103
 msgid "Initializing nodes to update ..."
-msgstr ""
+msgstr "Initialiseren van knopen om bij te werken ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:119
 msgid "Initializing ways to update ..."
-msgstr ""
+msgstr "Initialiseren van wegen om bij te werken ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:128
 msgid "Initializing relations to update ..."
-msgstr ""
+msgstr "Initialiseren van relaties om bij te werken ..."
 
 #: ../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
 msgid "Settings"
-msgstr ""
+msgstr "Instellingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
+"Bepaal hoe de gegevens moeten worden geüpload en welke wijzigingenset moet "
+"worden gebruikt"
 
 #: ../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 ""
+msgstr "Tags van nieuwe wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
+"Pas tags toe op de wijzigingenset  waar de gegevens naartoe zijn geüpload"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
+"Beheer geopende wijzigingensets en selecteer een wijzigingenset om naar toe "
+"te uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Gevorderde instellingen configureren"
 
 #: ../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
+msgstr "Uploaden naar ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../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
+msgstr "Upload de gewijzigde primitieven"
+
+#: ../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
+msgstr "Herstel de opmerking bij uploaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383
 msgid "Revise"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+msgstr "Herstel"
+
+#: ../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
+msgstr "Doorgaan zoals het is"
+
+#: ../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 "
@@ -12530,37 +12712,45 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:395
+"Uw opmerking bij uploaden is <i>leeg</i>, of <i>zeer kort</i>.<br /><br /"
+">Technisch is dit toegestaan, maar neem in overweging dat veel gebruikers "
+"die<br />wijzigingen bekijken in hun omgeving afhankelijk zijn van "
+"betekenisvolle opmerkingen<br />om te begrijpen wat er aan de hand is!<br /"
+"><br />Als u nu een minuutje spendeert aan het uitleggen van uw wijziging, "
+"zult u het leven<br />van vele andere mappers een stuk eenvoudiger maken."
+
+#: ../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
+"Terug naar het vorige dialoogvenster om een meer beschrijvende opmerking in "
+"te voeren"
+
+#: ../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
+msgstr "Annuleren en terug naar het vorige dialoogvenster"
+
+#: ../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
+msgstr "Negeer deze hint en upload toch"
+
+#: ../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
+msgstr "Toon dit bericht niet meer"
+
+#: ../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
+msgstr "Voer eerst een geldige grootte voor het gedeelte"
+
+#: ../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
+msgstr "Ongeldige grootte voor gedeelte"
+
+#: ../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
+msgstr "Annuleer het uploaden en hervat het bewerken"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 #, java-format
 msgid "Tags of changeset {0}"
-msgstr ""
+msgstr "Tags van wijzigingenset {0}"
 
 #. we tried to delete an already deleted primitive.
@@ -12573,14 +12763,15 @@
 "object and retrying to upload."
 msgstr ""
-"Waarschuwing: object \"{0}\" is reeds verwijderd op de server. Sla dit "
-"object over, versturen wordt opnieuw uitgevoerd"
+"Waarschuwing: object ''{0}'' is al verwijderd van de server. Sla dit object "
+"over en probeer opnieuw te uploaden."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing objects to upload ..."
-msgstr ""
+msgstr "Voorbereiden van objecten om te uploaden ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:40
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
+"Objecten zijn geüpload naar een <strong>nieuwe wijzigingenset</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
@@ -12590,16 +12781,19 @@
 "comment ''{1}''."
 msgstr ""
+"Objecten zijn geüpload naar de <strong>geopende wijzigingenset</strong> {0} "
+"met de opmerking voor uploaden ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:51
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
+msgstr "De wijzigingenset zal worden <strong>gesloten</strong> na dit uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:53
 msgid "The changeset is <strong>left open</strong> after this upload"
 msgstr ""
+"De wijzigingenset zal <strong>open gelaten worden</strong> na dit uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
 msgid "configure changeset"
-msgstr ""
+msgstr "wijzigingenset configureren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:77
@@ -12609,5 +12803,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"Uploaden van <strong>{0} object</strong> naar <strong>1 wijzigingenset</"
+"strong>"
 msgstr[1] ""
+"Uploaden van <strong>{0} objecten</strong> naar <strong>1 wijzigingenset</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:83
@@ -12620,5 +12818,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"Uploaden van <strong>{0} object</strong> naar <strong>1 wijzigingenset</"
+"strong> met behulp van <strong>1 verzoek</strong>"
 msgstr[1] ""
+"Uploaden van <strong>{0} objecten</strong> naar <strong>1 wijzigingenset</"
+"strong> met behulp van <strong>1 verzoek</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:88
@@ -12628,9 +12830,11 @@
 "<strong>{1} requests</strong>"
 msgstr ""
+"Uploaden van <strong>{0} objecten</strong> naar <strong>1 wijzigingenset</"
+"strong> met behulp van <strong>{1} verzoeken</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
 msgid "advanced configuration"
-msgstr ""
+msgstr "gevorderde configuratie"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -12641,4 +12845,8 @@
 "proceed with <strong>multiple changesets</strong>"
 msgstr ""
+"{0} objecten overschrijden de max. toegestane {1} objecten in een "
+"wijzigingenset op de server ''{2}''. <a href=\"urn:advanced-configuration"
+"\">Configureer</a> hoe doorgegaan moet worden met <strong>meerdere "
+"wijzigingensets</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97
@@ -12648,34 +12856,37 @@
 "strong> using <strong>{1} requests</strong>"
 msgstr ""
+"Uploaden van <strong>{0} objecten</strong> naar <strong>meerdere "
+"wijzigingensets</strong> met behulp van <strong>{1} verzoeken</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:64
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "Data aan het uploaden voor laag ''{0}''"
+msgstr "Gegevens aan het uploaden voor laag ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:78
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275
 msgid "Continue uploading"
-msgstr ""
+msgstr "Doorgaan met uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
 msgid "Click to continue uploading to additional new changesets"
 msgstr ""
+"Klik om dor te gaan met uploaden naar aanvullende nieuwe wijzigingensets"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:84
 msgid "Go back to Upload Dialog"
-msgstr ""
+msgstr "Ga terug naar dialoogvenster Uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86
 msgid "Click to return to the Upload Dialog"
-msgstr ""
+msgstr "Klik om terug te keren naar het dialoogvenster Uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:90
 msgid "Abort"
-msgstr ""
+msgstr "Afbreken"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
 msgid "Click to abort uploading"
-msgstr ""
+msgstr "Klik om het uploaden af te breken"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:97
@@ -12686,4 +12897,7 @@
 "on the server ''{1}''."
 msgstr ""
+"De server rapporteerde dat de huidige wijzigingenset was gesloten.<br>Dit "
+"komt vermoedelijk door het feit dat de grootte van de wijzigingensets de "
+"max. grootte<br>van {0} objecten op de server ''{1}'' overschrijdt."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:104
@@ -12691,6 +12905,6 @@
 msgid "There is {0} object left to upload."
 msgid_plural "There are {0} objects left to upload."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er is {0} object over om te worden geüpload."
+msgstr[1] "Er zijn {0} objecten over om te worden geüpload."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:110
@@ -12702,13 +12916,18 @@
 "editing.<br>"
 msgstr ""
+"Klik op ''<strong>{0}</strong>'' om door te gaan met het uploaden van "
+"aanvullende nieuwe wijzigingensets.<br>Klik op ''<strong>{1}</strong>'' om "
+"terug te keren naar het dialoogvenster Uploaden.<br>Klik op ''<strong>{2}</"
+"strong>'' om het uploaden af te breken en terug te keren naar het bewerken "
+"van de kaart.<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:121
 msgid "Changeset is full"
-msgstr ""
+msgstr "Wijzigingenset is vol"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:192
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr "Object \"{0}\" is reeds verwijderd. Sla object over met versturen"
+msgstr "Object ''{0}'' is al verwijderd. Object overslaan in upload."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:229
@@ -12717,6 +12936,6 @@
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Uploaden van {0} object..."
+msgstr[1] "Uploaden van {0} objecten..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
@@ -12724,5 +12943,6 @@
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
-"Negeer uitzondering omdat versturen afgebroken is. De uitzondering is: {0}"
+"Negeren van de opgetreden uitzondering omdat het uploaden is geannuleerd. "
+"Uitzondering is: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
@@ -12731,4 +12951,6 @@
 "be uploaded to the server.</html>"
 msgstr ""
+"<html>Markeer aangepaste objecten <strong>in de huidige selectie</strong> om "
+"te worden geüpload naar de server.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
@@ -12737,12 +12959,14 @@
 "server.</html>"
 msgstr ""
+"<html>Markeer <strong>lokaal verwijderde objecten</strong> om te worden "
+"verwijderd op de server.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Selecteer objecten om te uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Uploaden annuleren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:88
@@ -12750,21 +12974,23 @@
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
 msgstr ""
+"Waarschuwing: onverwachte waarde voor sleutel ''{0}'' in voorkeuren, kreeg "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
 msgid "Please select the upload strategy:"
-msgstr ""
+msgstr "Selecteer de strategie voor het uploaden:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343
 msgid "Upload data in one request"
-msgstr ""
+msgstr "Upload gegevens in één verzoek"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
 msgid "Upload data in chunks of objects. Chunk size: "
-msgstr ""
+msgstr "Upload gegevens in gedeelten van objecten. Grootte gedeelte: "
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
 msgid "Upload each object individually"
-msgstr ""
+msgstr "Upload elk object individueel"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
@@ -12775,16 +13001,19 @@
 "upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
+"<html>Er zijn <strong>meerdere wijzigingensets</strong> in volgorde nodig om "
+"{0} objecten te uploaden. Welke strategie wilt u gebruiken?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
 msgid "Fill up one changeset and return to the Upload Dialog"
 msgstr ""
+"Vul een wijzigingenset op en keer terug naar het dialoogvenster Uploaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "Open en gebruik zoveel nieuwe wijzigingensets als nodig zijn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
-msgstr ""
+msgstr "Uploaden in één verzoek niet mogelijk (te veel objecten te uploaden)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
@@ -12794,8 +13023,11 @@
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
+"<html>Kan {0} objecten niet in één verzoek uploaden omdat de<br>max. grootte "
+"van de wijzigingenset size {1} op de server ''{2}'' wordt overschreden.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
 msgid "(1 request)"
-msgstr ""
+msgstr "(1 verzoek)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353
@@ -12804,5 +13036,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362
 msgid "(# requests unknown)"
-msgstr ""
+msgstr "(# onbekende verzoeken)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357
@@ -12811,10 +13043,10 @@
 msgid "({0} request)"
 msgid_plural "({0} requests)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0} verzoek)"
+msgstr[1] "({0} verzoeken)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
 msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
+msgstr "Ongeldige grootte voor gedeelte <= 0. Voer een geheel getal > 1 in"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413
@@ -12823,13 +13055,15 @@
 msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
 msgstr ""
+"Grootte van gedeelte {0} overschrijdt max. grootte van wijzigingenset {1} "
+"voor server ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
 msgid "Please enter an integer > 1"
-msgstr ""
+msgstr "Voer een geheel getal > 1 in"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422
 #, java-format
 msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
-msgstr ""
+msgstr "Waarde ''{0}'' is geen getal. Voer een geheel getal > 1 in"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52
@@ -12839,9 +13073,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58
 msgid "Objects to modify:"
-msgstr "Objecten om te bewerken:"
+msgstr "Objecten om aan te passen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64
 msgid "Objects to delete:"
-msgstr "Objecten om aan te verwijderen:"
+msgstr "Objecten om te verwijderen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95
@@ -12849,6 +13083,6 @@
 msgid "{0} object to add:"
 msgid_plural "{0} objects to add:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} object toe te voegen:"
+msgstr[1] "{0} objecten toe te voegen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104
@@ -12856,6 +13090,6 @@
 msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} object aan te passen:"
+msgstr[1] "{0} objecten aan te passen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
@@ -12863,6 +13097,6 @@
 msgid "{0} object to delete:"
 msgid_plural "{0} objects to delete:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} object te verwijderen:"
+msgstr[1] "{0} objecten te verwijderen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:40
@@ -12904,6 +13138,6 @@
 msgid "{0} track"
 msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} spoor,"
+msgstr[1] "{0} sporen,"
 
 #. item "Relations/Route" text "Description"
@@ -12912,5 +13146,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
@@ -12925,5 +13159,5 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
-msgstr ""
+msgstr "Tijsduur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
@@ -12931,5 +13165,5 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
-msgstr ""
+msgstr "Lengte"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
@@ -12939,5 +13173,5 @@
 #, java-format
 msgid "Length: {0}"
-msgstr ""
+msgstr "Lengte: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:235
@@ -12958,6 +13192,6 @@
 msgid "{0} waypoint"
 msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
+msgstr[0] "{0} wegpunt"
+msgstr[1] "{0} wegpunten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:251
@@ -12972,6 +13206,6 @@
 msgid "{0} track, "
 msgid_plural "{0} tracks, "
-msgstr[0] "{0} track, "
-msgstr[1] "{0} tracks, "
+msgstr[0] "{0} spoor, "
+msgstr[1] "{0} sporen, "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
@@ -12986,6 +13220,6 @@
 msgstr ""
 "<html>Uploaden van onbewerkte GPS gegevens als kaartgegevens wordt als "
-"schadelijk beschouwd.<br>Als je spooropnames (traces) wil oploaden, zie hier:"
-"</html>"
+"schadelijk beschouwd.<br>Als je sporen (traces) wilt uploaden, zie hier:</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
@@ -13005,5 +13239,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
 msgid "Choose visible tracks"
-msgstr ""
+msgstr "Kies zichtbare sporen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:986
@@ -13013,17 +13247,21 @@
 "updated live in the background. Open the URLs by double clicking them.</html>"
 msgstr ""
+"<html>Selecteer alle sporen die u wilt weergeven. U kunt een bereik met "
+"sporen selecteren door te slepen of door CTRL+klik te gebruiken om "
+"specifieke sporen te selecteren. De kaart wordt op de achtergrond live "
+"bijgewerkt. Open de URL's door er op te dubbelklikken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1004
 #, java-format
 msgid "Set track visibility for {0}"
-msgstr ""
+msgstr "Stel de zichtbaarheid voor sporen in voor {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 msgid "Show all"
-msgstr ""
+msgstr "Alles tonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 msgid "Show selected only"
-msgstr ""
+msgstr "Alleen geselecteerde tonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1052
@@ -13036,5 +13274,5 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:869
 msgid "Download from OSM along this track"
-msgstr "Uit OSM langs deze track downloaden"
+msgstr "Uit OSM downloaden langs dit spoor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1062
@@ -13055,5 +13293,5 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
 msgid "Maximum area per request:"
-msgstr "Maximum oppervlak per verzoek:"
+msgstr "Maximale oppervlakte per verzoek:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
@@ -13067,24 +13305,24 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
-msgstr ""
+msgstr "Download nabij:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
-msgstr ""
+msgstr "alleen spoor"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
-msgstr ""
+msgstr "alleen wegpunten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
-msgstr ""
+msgstr "spoor en wegpunten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1158
 msgid "Calculating Download Area"
-msgstr ""
+msgstr "Te downloaden gebied berekenen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1262
@@ -13096,11 +13334,11 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Deze opdracht heeft {0} losse downloadverzoeken<br>nodig. Wil je "
-"verder<br>gaan?</html>"
+"<html>Deze actie vereist {0} individuele<br>verzoeken om te downloaden. Wilt "
+"u<br>doorgaan?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:975
 msgid "No GPX track available in layer to associate audio with."
-msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
+msgstr "Geen GPX-spoor in laag beschikbaar om geluid mee te koppelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1536
@@ -13110,6 +13348,6 @@
 "the end were omitted or moved to the start."
 msgstr ""
-"Sommige waypoints met tijdmarkeringen van vóór de start of na het einde van "
-"de track zijn overgeslagen of naar de start verplaatst."
+"Sommige wegpunten met tijdmarkeringen van vóór de start of na het einde van "
+"het spoor zijn overgeslagen of naar de start verplaatst."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1543
@@ -13119,16 +13357,16 @@
 "time were omitted."
 msgstr ""
-"Enkele waypoints, die te ver van de track liggen om hun tijd zinnig te "
-"kunnen schatten, zijn overgeslagen."
+"Enkele wegpunten, die te ver van het spoor liggen om hun tijd zinnig te "
+"kunnen schatten, werden weggelaten."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1677
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1714
 msgid "Customize track drawing"
-msgstr ""
+msgstr "Tekenen van spoor aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1731
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1331
 msgid "Markers From Named Points"
-msgstr "Markers van benoemde punten"
+msgstr "Markeringen van benoemde punten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1747
@@ -13136,5 +13374,5 @@
 #, java-format
 msgid "Named Trackpoints from {0}"
-msgstr "Benoemde trackpunten van {0}"
+msgstr "Benoemde spoorpunten van {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1759
@@ -13151,4 +13389,7 @@
 "them with audio data.</html>"
 msgstr ""
+"<html>De gegevens in de GPX-laag ''{0}'' is gedownload vanaf de server."
+"<br>Omdat de wegpunten daarvan geen tijdstempel bevatten kunnen we ze niet "
+"corresponderen met gegevens van de data.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1771
@@ -13157,5 +13398,5 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
 msgid "Import not possible"
-msgstr ""
+msgstr "Importeren niet mogelijk"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1795
@@ -13168,5 +13409,5 @@
 #, java-format
 msgid "Audio markers from {0}"
-msgstr "Geluidsmarkers van {0}"
+msgstr "Geluidsmarkeringen van {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1849
@@ -13183,21 +13424,24 @@
 "them with images.</html>"
 msgstr ""
+"<html>De gegevens in de GPX-laag ''{0}'' is gedownload vanaf de server."
+"<br>Omdat de wegpunten daarvan geen tijdstempel bevatten kunnen we ze niet "
+"corresponderen met afbeeldingen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:56
 msgid "Imagery fade"
-msgstr ""
+msgstr "Luchtfoto vervagen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:172
 msgid "(use server offset)"
-msgstr ""
+msgstr "(gebruik verschuiving van server)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:244
 msgid "ERROR"
-msgstr ""
+msgstr "FOUT"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:350
 msgid "All projections are supported"
-msgstr ""
+msgstr "Alle projecties worden ondersteund"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:409
@@ -13208,4 +13452,7 @@
 "Change the projection again or remove the layer."
 msgstr ""
+"De laag {0} ondersteunt niet de nieuwe projectie {1}.\n"
+"{2}\n"
+"Wijzig de projectie opnieuw of verwijder de laag."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119
@@ -13225,5 +13472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:320
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
+msgstr "Waarschuwing: mixen van 0.6 en 0.5 gegevensresultaten in versie 0.5"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
@@ -13231,10 +13478,10 @@
 msgid "There was {0} conflict detected."
 msgid_plural "There were {0} conflicts detected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Er werd {0} conflict gedetecteerd."
+msgstr[1] "Er werden {0} conflicten gedetecteerd."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:358
 msgid "Click to close this dialog and continue editing"
-msgstr ""
+msgstr "Klik om het dialoogvenster te sluiten en door te gaan met bewerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:424
@@ -13244,6 +13491,6 @@
 msgid "{0} deleted"
 msgid_plural "{0} deleted"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} verwijderd"
+msgstr[1] "{0} verwijderd"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
@@ -13254,5 +13501,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
 msgid "unset"
-msgstr ""
+msgstr "niet ingesteld"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
@@ -13268,15 +13515,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
 msgid "Dataset consistency test"
-msgstr ""
+msgstr "Gegevensset test voor consistentie"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
 msgid "No problems found"
-msgstr ""
+msgstr "Geen problemen gevonden"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:652
 msgid "Following problems found:"
-msgstr "Vond volgende problemen:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331
+msgstr "Volgende problemen gevonden:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324
 #, java-format
 msgid ""
@@ -13285,181 +13532,158 @@
 "Change the projection or remove the layer."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:350
+"TMS-lagen ondersteunen niet de projectie {0}.\n"
+"{1}\n"
+"Wijzig de projectie of verwijder de laag."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343
 msgid "Auto Zoom"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:361
+msgstr "Automatisch in-/uitzoomen"
+
+#: ../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
+msgstr "Automatisch tegels laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:365
 msgid "Show Errors"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381
+msgstr "Fouten weergeven"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../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
+msgstr "Tegelinfo weergeven"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:408
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../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
+msgstr "Alle fouten voor tegels laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:436
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../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
+msgstr "Vangen aan grootte van tegel"
+
+#: ../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
+msgstr "Cache voor tegels leegmaken"
+
+#: ../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
+msgstr "inzoomen om tegels te laden"
+
+#: ../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
+msgstr "inzoomen om meer tegels te laden"
+
+#: ../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
+msgstr "vergoot het zoomniveau om meer detail te zien"
+
+#: ../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
+msgstr "Geen tegels op dit zoomniveau"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1380
 msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
+msgstr "EPSG:4326- en Mercator-projectie worden ondersteund"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java:38
 #: ../core/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java:96
 msgid "Validation errors"
-msgstr "Validatiefouten"
+msgstr "Fouten bij valideren"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java:94
 msgid "No validation errors"
-msgstr "Geen validatiefouten"
-
-#: ../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
+msgstr "Geen fouten bij valideren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:194
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../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 "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../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 "Zichtbare tegels downloaden"
 
-#: ../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 ""
-"Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583
+"Het gevraagde gebied is te groot. Zoom een beetje in, of wijzig de resolutie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../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 "Foutieve tegels herladen"
 
-#: ../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
+msgstr "Alfa-kanaal"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:638
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../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
+msgstr "WMS-laag opslaan"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:667
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../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
+msgstr "WMS-laag laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:683
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:730
+msgstr "Niet-ondersteunde WMS-bestandsversie; gevonden {0}, verwachtte {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../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 "Laden bestand is mislukt"
 
-#: ../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
+msgstr "Stel WMS-bladwijzer in"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746
 msgid "Automatic downloading"
 msgstr "Automatisch downloaden"
 
-#: ../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
+msgstr "Zoom naar eigen resolutie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:888
 #, java-format
 msgid "Supported projections are: {0}"
-msgstr ""
+msgstr "Ondersteunde projecties zijn: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
@@ -13484,5 +13708,5 @@
 #, java-format
 msgid "Could not read \"{0}\""
-msgstr "Kan \"{0}\" niet lezen"
+msgstr "Kon \"{0}\" niet lezen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
@@ -13492,11 +13716,11 @@
 "on the photo and select a timezone<hr></html>"
 msgstr ""
-"<html>Maak een opname van je GPS-ontvanger met de tijd weergegeven.<br>Toon "
-"deze foto hier.<br>Voer vervolgens de afgebeelde tijd hier in en selecteer "
-"een tijdzone<hr></html>"
+"<html>Maak een opname van je GPS-ontvanger terwijl die de tijd weergeeft."
+"<br>Toon die foto hier.<br>Voer vervolgens de afgebeelde tijd hier in en "
+"selecteer een tijdzone<hr></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
-msgstr "Fototijd (uit exif):"
+msgstr "Tijd op foto (uit exif):"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
@@ -13506,9 +13730,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr " [dd/mm/yyyy hh:mm:ss]"
+msgstr " [dd-mm-yyyy hh:mm:ss]"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
-msgstr "Ik bevind mij in tijdzone: "
+msgstr "Ik bevind mij in de tijdzone: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
@@ -13530,6 +13754,6 @@
 "Please use the requested format"
 msgstr ""
-"Het ontleden van de datum is mislukt.\n"
-"Gebruik de verwachte indeling a.u.b."
+"Fout tijdens ontleden van gegevens.\n"
+"Gebruik de verzochte indeling"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:433
@@ -13539,13 +13763,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
 msgid "<No GPX track loaded yet>"
-msgstr "<Nog geen GPX-track geladen>"
+msgstr "<Nog geen GPX-spoor geladen>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:482
 msgid "GPX track: "
-msgstr "GPX-track: "
+msgstr "GPX-spoor: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:491
 msgid "Open another GPX trace"
-msgstr "Een ander GPX-spoor openene"
+msgstr "Een ander GPX-spoor openen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
@@ -13553,5 +13777,5 @@
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
-"<html>Gebruik foto met een accurate klok,<br>bvb scherm van de GPS-"
+"<html>Gebruik foto van een accurate klok,<br>bijv. scherm van de GPS-"
 "ontvanger</html>"
 
@@ -13562,5 +13786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 msgid "Matches first photo with first gpx point"
-msgstr "Koppel eerste foto aan eerste gpx punt"
+msgstr "Koppel eerste foto aan eerste GPX-punt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
@@ -13570,10 +13794,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
 msgid "Override position for: "
-msgstr "Verbeter positie voor: "
+msgstr "Overschrijf positie voor: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:539
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
-msgstr "Afbeeldingen met geolokatie in exif gegevens({0}/{1})"
+msgstr "Afbeeldingen met geolokatie in EXIF-gegevens({0}/{1})"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:542
@@ -13584,5 +13808,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:548
 msgid "Show Thumbnail images on the map"
-msgstr "Toon verkleinde afbeeldingen op de kaart"
+msgstr "Toon miniaturen op de kaart"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573
@@ -13597,5 +13821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:701
 msgid "Correlate images with GPX track"
-msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
+msgstr "Verband tussen afbeeldingen en GPX-sporen leggen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
@@ -13621,5 +13845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:827
 msgid "No gpx selected"
-msgstr "Geen gpx geselekteerd"
+msgstr "Geen GPX geselecteerd"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:832
@@ -13659,10 +13883,11 @@
 "adjust the sliders to manually match the photos."
 msgstr ""
-"Er trad een fout op bij het koppelen van de foto’s aan het GPX-spoor. Je kan "
-"de shuif-indexen aanpassen om de foto’s handmatig te koppelen."
+"Er trad een fout op bij het proberen te koppelen van de foto's aan het GPX-"
+"spoor. U kunt de schuifbalken handmatig aanpassen om de foto's handmatig te "
+"matchen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:962
 msgid "Matching photos to track failed"
-msgstr "Koppelen van foto’s aan track is mislukt"
+msgstr "Koppelen van foto's aan spoor is mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:978
@@ -13672,9 +13897,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:998
 msgid "The selected photos do not contain time information."
-msgstr "De selecteerde foto''s bevatten geen tijdinformatie."
+msgstr "De selecteerde foto''s bevatten geen informatie over tijd."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:999
 msgid "Photos do not contain time information"
-msgstr "Foto''s bevatten geen tijdinformatie."
+msgstr "Foto''s bevatten geen informatie over tijd."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1027
@@ -13683,17 +13908,17 @@
 "one."
 msgstr ""
-"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
+"Het geselecteerde GPX-spoor bevat geen tijdstempels. Selecteer een ander."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1028
 msgid "GPX Track has no time information"
-msgstr "GPX-track heeft geen tijdinformatie"
+msgstr "GPX-spoor heeft geen informatie over tijd"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1123
 msgid "You should select a GPX track"
-msgstr "U mag een GPX-track selecteren"
+msgstr "U moet een GPX-spoor selecteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1124
 msgid "No selected GPX track"
-msgstr "Geen GPX-tracks geselecteerd"
+msgstr "Geen GPX-spoor geselecteerd"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1316
@@ -13703,6 +13928,6 @@
 "Expected format: {0}"
 msgstr ""
-"Ontleden van tijdzone is mislukt.\n"
-"Verwachte indeling: {0}"
+"Fout tijdens ontleden van tijdzone.\n"
+"Verwachtte indeling: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1386
@@ -13712,6 +13937,6 @@
 "Expected format: {0}"
 msgstr ""
-"Ontleden van verschuiving is mislukt.\n"
-"Verwachte indeling: {0}"
+"Fout tijdens ontleden van verschuiving.\n"
+"Verwachtte indeling: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
@@ -13721,14 +13946,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
 msgid "Starting directory scan"
-msgstr "Mappenscan starten"
+msgstr "Scan van mappen starten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
 msgid "One of the selected files was null"
-msgstr "Een van de geselekteerde bestanden was leeg (null)"
+msgstr "Een van de geselecteerde bestanden was leeg (null)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
 msgid "Read photos..."
-msgstr "Foto’s lezen..."
+msgstr "Foto's lezen..."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
@@ -13760,5 +13985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
-msgstr "Geotagged afbeeldingen"
+msgstr "Afbeeldingen met geo-tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
@@ -13774,5 +13999,5 @@
 msgid_plural "{0} were found to be GPS tagged."
 msgstr[0] "{0} was aangetroffen met GPS-tag."
-msgstr[1] "{0} waren aangetroffen met GPS-tag."
+msgstr[1] "{0} werden aangetroffen met GPS-tag."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
@@ -13787,6 +14012,6 @@
 "permanently lost!</h3></html>"
 msgstr ""
-"<html><h3>Wis bestand {0} van de schijf?<p>De afbeelding zal definitief "
-"verloren zijn!</h3></html>"
+"<html><h3>Verwijder bestand {0} van de schijf?<p>De afbeelding zal "
+"definitief verloren gaan!</h3></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:692
@@ -13807,9 +14032,9 @@
 #, java-format
 msgid "Error on file {0}"
-msgstr "Bestand {0} gaat fout"
+msgstr "Fout met bestand {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
-msgstr "Toon afbeeldingen met geo-tag"
+msgstr "Toon afbeeldingen met geo-tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
@@ -13832,5 +14057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
-msgstr "Foto uit laag verwijderen"
+msgstr "Verwijder foto uit laag"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
@@ -13839,5 +14064,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"
@@ -13858,5 +14086,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "Verplaats dialoogvenster naar venster aan zijkant"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
@@ -13876,5 +14104,5 @@
 msgstr ""
 "\n"
-"{0} km/h"
+"{0} km/u"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:242
@@ -13884,4 +14112,6 @@
 "Direction {0}°"
 msgstr ""
+"\n"
+"Richting {0}°"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
@@ -13892,11 +14122,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:144
 msgid "gps marker"
-msgstr "GPS-marker"
+msgstr "GPS-markering"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:168
 msgid "marker"
 msgid_plural "markers"
-msgstr[0] "marker"
-msgstr[1] "markers"
+msgstr[0] "markering"
+msgstr[1] "markeringen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:187
@@ -13904,18 +14134,21 @@
 msgid "{0} consists of {1} marker"
 msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} bestaat uit {1} marker"
-msgstr[1] "{0} bestaat uit {1} markers"
+msgstr[0] "{0} bestaat uit {1} markering"
+msgstr[1] "{0} bestaat uit {1} markeringen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "No existing audio markers in this layer to offset from."
-msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
+msgstr ""
+"Geen bestaande geluidsmarkeringen in deze laag om vanaf te verschuiven."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:369
 msgid "Show Text/Icons"
-msgstr ""
+msgstr "Tekst/Pictogrammen weergeven"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:370
 msgid "Toggle visible state of the marker text and icons."
-msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
+msgstr ""
+"Zichtbaarheid van de tekst van de markering en pictogrammen in- of "
+"uitschakelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:398
@@ -13926,5 +14159,6 @@
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
-msgstr "Pauzeer het geluid op het moment dat je de synchronisatiehulp hoort."
+msgstr ""
+"Pauzeer het geluid op het moment dat je de hulp bij synchronisatie hoort."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:417
@@ -13941,5 +14175,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:435
 msgid "Make Audio Marker at Play Head"
-msgstr "Geluidsmarker op afspeelstart zetten"
+msgstr "Geluidsmarkering bij afspeelkop zetten"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:444
@@ -13948,6 +14182,6 @@
 "marker."
 msgstr ""
-"Je moet het geluid gepauzeerd hebben op het punt in de track waar je de "
-"marker wilt hebben."
+"Je moet het geluid gepauzeerd hebben op het punt in het spoor waar je de "
+"markering wilt hebben."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -13956,6 +14190,6 @@
 "track you were playing (after the first marker)."
 msgstr ""
-"U moet de afspeelstart nabij de GPX-track slepen waarvan u de gekoppelde "
-"geluidsopname afspeelde (na de eerste marker)."
+"U moet de afspeelkop nabij het GPX-spoor slepen waarvan u de gekoppelde "
+"geluidsopname afspeelde (na de eerste markering)."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
@@ -13964,14 +14198,14 @@
 "point where you want to synchronize."
 msgstr ""
-"Je moet de afspeelstart slepen (Shift-toets ingedrukt) op de geluidsmarker "
-"of op het trackpunt waar je wilt synchroniseren."
+"Je moet de afspeelkop slepen (Shift-toets ingedrukt) op de geluidsmarkering "
+"of op het punt van het spoor waar je wilt synchroniseren."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
-msgstr "Kan nieuwe geluidsmarker niet aanmaken."
+msgstr "Kan nieuwe geluidsmarkering niet aanmaken."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:35
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Fout tijdens het tonen van de URL van deze marker"
+msgstr "Fout tijdens het tonen van de URL voor deze markering"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:36
@@ -13981,5 +14215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:37
 msgid "Error displaying URL"
-msgstr "Fouten tijden tonen URL"
+msgstr "Fout bij tonen URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:199
@@ -13990,9 +14224,11 @@
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
+"Waarschuwing: Laden kaarttekenstijlen mislukt vanaf ''{0}''. Uitzondering "
+"was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:260
 #, java-format
 msgid "loading style ''{0}''..."
-msgstr ""
+msgstr "stijl laden ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java:98
@@ -14005,5 +14241,9 @@
 "right click menu for details."
 msgstr[0] ""
+"Er trad een fout op tijdens het laden van deze stijl. Selecteer ''Info'' uit "
+"het rechtsklik-menu voor details."
 msgstr[1] ""
+"Er traden {0} fouten op bij het laden van deze stijl. Selecteer ''Info'' uit "
+"het rechtsklik-menu voor details."
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:74
@@ -14013,12 +14253,14 @@
 msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
 msgstr ""
+"Waarschuwing: Ontleden van kaarttekenstijlen mislukt vanaf ''{0}''. Fout "
+"was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java:64
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Ongeldig patroon van streepjes, waarden moeten positief zijn"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java:72
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "Ongeldig patroon van streepjes, ten minste één waarde moet > 0 zijn"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81
@@ -14028,4 +14270,6 @@
 "{3}"
 msgstr ""
+"Waarschuwing: Ontleden van kaarttekenstijlen mislukt vanaf ''{0}''. Fout "
+"was: [{1}:{2}] {3}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -14033,5 +14277,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:230
 msgid "Access Token Key:"
-msgstr ""
+msgstr "Sleutel voor Toegangstoken:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
@@ -14039,9 +14283,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:242
 msgid "Access Token Secret:"
-msgstr ""
+msgstr "Geheime code voor Toegangstoken:"
 
 #: ../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 ""
+msgstr "Sla Toegangstoken op in voorkeuren"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
@@ -14050,37 +14295,43 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
+"<html>Selecteren om het Toegangstoken op te slaan in de voorkeuren van JOSM."
+"<br>Niet selecteren om het Toegangstoken alleen in deze sessie van JOSM te "
+"gebruiken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
 msgid "Use default settings"
-msgstr ""
+msgstr "Gebruik standaard instellingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
 msgid "Consumer Key:"
-msgstr ""
+msgstr "Sleutel van gebruiker:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
 msgid "Consumer Secret:"
-msgstr ""
+msgstr "Geheime code van gebruiker:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
 msgid "Request Token URL:"
-msgstr ""
+msgstr "Token URL aanvragen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
 msgid "Access Token URL:"
-msgstr ""
+msgstr "URL van Toegangstoken:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
 msgid "Authorize URL:"
-msgstr ""
+msgstr "URL voor autoriseren:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
 msgid "Click to reset the OAuth settings to default values"
 msgstr ""
+"Klik om de instellingen van OAuth naar de standaard waarden terug te zetten"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
 msgid "Click to abort resetting to the OAuth default values"
 msgstr ""
+"Klik om het herstellen van de standaard waarden van de instellingen voor "
+"OAuth af te breken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
@@ -14089,20 +14340,23 @@
 "current custom settings are not saved.</html>"
 msgstr ""
+"<html>JOSM staat op het punt om de instellingen van OAuth terug te zetten "
+"naar de standaard waarden.<br>De huidige aangepaste instellingen worden niet "
+"opgeslagen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
 msgid "Overwrite custom OAuth settings?"
-msgstr ""
+msgstr "Aangepaste instellingen van OAuth overschrijven?"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
 msgid "Fully automatic"
-msgstr ""
+msgstr "Volautomatisch"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
 msgid "Semi-automatic"
-msgstr ""
+msgstr "Semi-automatisch"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
 msgid "Manual"
-msgstr ""
+msgstr "Handmatig"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
@@ -14113,4 +14367,8 @@
 "html>"
 msgstr ""
+"<html>Voer een volautomatische procedure uit om een toegangstoken van de "
+"website van OSM te krijgen.<br>JOSM verkrijgt toegang tot de website van OSM "
+"ten behoeve van de gebruiker van JOSM en<br>autoriseert de gebruiker "
+"volautomatisch en verkrijgt een Toegangstoken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -14122,4 +14380,10 @@
 "submitted by JOSM.</html>"
 msgstr ""
+"<html>Voer een semi-automatische procedure uit om een toegangstoken van de "
+"website van OSM te krijgen.<br>JOSM levert de standaard verzoeken voor OAuth "
+"aan om een Verzoektoken en een<br>Toegangstoken te krijgen. Het levert de "
+"gegevens van de gebruiker aan bij de website van OSM in een externe "
+"browser<br>om zichzelf te authenticeren en het door JOSM verstrekte "
+"verzoektoken te accepteren.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
@@ -14128,4 +14392,6 @@
 "outside<br>of JOSM.</html>"
 msgstr ""
+"<html>Voer een Toegangstoken handmatig in als dat werd gegenereerd en "
+"verkregen van buiten<br>JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
@@ -14136,14 +14402,19 @@
 "upload requests don''t use your password any more."
 msgstr ""
+"Voer uw gebruikersnaam en wachtwoord voor JOSM in. Het wachtwoord zal "
+"<strong>niet</strong> in heldere tekst worden opgeslagen in de voorkeuren "
+"van JOSM en het zal <strong>slechts één keer</strong> worden aangeleverd aan "
+"de server van OSM. Opvolgende verzoeken voor het uploaden van gegevens "
+"gebruiken uw wachtwoord niet meer."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
-msgstr ""
+msgstr "Gebruikersnaam: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:126
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
 msgid "Password: "
-msgstr ""
+msgstr "Wachtwoord: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:147
@@ -14152,17 +14423,19 @@
 "secure connection."
 msgstr ""
+"<strong>Waarschuwing:</strong> JOSM logt <strong>éénmaal</strong> in met "
+"behulp van een veilige verbinding."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:171
 msgid "Granted rights"
-msgstr ""
+msgstr "Toegewezen rechten"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:172
 msgid "Advanced OAuth properties"
-msgstr ""
+msgstr "Uitgebreide eigenschappen voor OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:232
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357
 msgid "Accept Access Token"
-msgstr ""
+msgstr "Toegangstoken accepteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:233
@@ -14173,23 +14446,31 @@
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
+"<html>U heeft met succes een Toegangstoken van OAuth gekregen vanaf de "
+"website van OSM. Klik op <strong>{0}</strong> om het token te accepteren. "
+"JOSM zal het in volgende verzoeken gebruiken om toegang te verkrijgen tot de "
+"API van OSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:327
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:302
 msgid "Authorize now"
-msgstr ""
+msgstr "Nu autoriseren"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
 msgid "Click to redirect you to the authorization form on the JOSM web site"
 msgstr ""
+"Klik om u door te leiden naar het formulier voor autorisatie op de website "
+"van JOSM"
 
 #: ../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"
-msgstr "Achteruit"
+msgstr "Terug"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:360
 msgid "Run the automatic authorization steps again"
-msgstr ""
+msgstr "Voer de stappen voor het automatisch autoriseren nogmaals uit"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:374
@@ -14198,5 +14479,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:352
 msgid "Test Access Token"
-msgstr ""
+msgstr "Test Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:403
@@ -14204,5 +14485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
 msgid "Please enter your OSM user name"
-msgstr ""
+msgstr "Voer uw gebruikersnaam voor OSM in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:405
@@ -14211,17 +14492,18 @@
 msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
+"De gebruikersnaam mag niet leeg zijn. Voer uw gebruikersnaam voor OSM in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
-msgstr ""
+msgstr "Voer uw wachtwoord voor OSM in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
 msgid "The password cannot be empty. Please enter your OSM password"
-msgstr ""
+msgstr "Het wachtwoord mag niet leeg zijn. Voer uw wachtwoord voor OSM in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:436
 msgid "Authorize JOSM to access the OSM API"
-msgstr ""
+msgstr "JOSM autoriseren om toegang te krijgen tot de API van OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:450
@@ -14231,4 +14513,8 @@
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
+"<html>Het geautomatiseerde proces voor het verkrijgen van een Toegangstoken "
+"van OAuth<br>vanaf de server van OSM is mislukt.<br><br>probeer het opnieuw "
+"of kies een ander soort proces voor het autoriseren,<br>d.i. semi-"
+"automatische of handmatige autorisatie.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456
@@ -14236,5 +14522,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496
 msgid "OAuth authorization failed"
-msgstr ""
+msgstr "Autorisatie van OAuth mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:465
@@ -14246,4 +14532,9 @@
 "advanced setting and try again.</html>"
 msgstr ""
+"<html>Het geautomatiseerde proces voor het verkrijgen van een Toegangstoken "
+"van OAuth<br>vanaf de server van OSM is mislukt omdat JOSM niet in staat was "
+"om<br>een geldige URL voor login te bouwen uit de URL van het OAuth "
+"Authorize Endpoint ''{0}''.<br><br>Controleer uw uitgebreide instellingen en "
+"probeer het opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:488
@@ -14254,4 +14545,8 @@
 "<br><br>Please check username and password and try again.</html>"
 msgstr ""
+"<html>Het geautomatiseerde proces voor het verkrijgen van een Toegangstoken "
+"van OAuth<br>vanaf de server van OSM is mislukt. JOSM kon niet inloggen in "
+"{0}<br>voor gebruiker {1}.<br><br>Controleer gebruikersnaam en wachtwoord en "
+"probeer het opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -14261,24 +14556,22 @@
 "server ''{0}''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
-msgid "Save Access Token to preferences"
-msgstr ""
+"Voer een Toegangstoken voor OAuth in dat is geautoriseerd om toegang te "
+"krijgen tot de server van OSM ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
 msgid "Access Token"
-msgstr ""
+msgstr "Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
 msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Uitgebreide parameters voor OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
 msgid "Enter the OAuth Access Token"
-msgstr ""
+msgstr "Voer het Toegangstoken voor OAuth in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
 msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "Voer uitgebreide eigenschappen voor OAuth in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
@@ -14288,8 +14581,10 @@
 "the OSM server ''{0}''.</body></html>"
 msgstr ""
+"<html><body>Voer een Toegangstoken voor OAuth in dat is geautoriseerd om "
+"toegang te krijgen tot de server van OSM ''{0}''.</body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "Voer een sleutel voor een Toegangstoken in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
@@ -14297,8 +14592,10 @@
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
+"De sleutel voor het Toegangstoken mag niet leeg zijn. Voer een sleutel voor "
+"een Toegangstoken in"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Voer een geheime code in voor een Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
@@ -14307,9 +14604,11 @@
 "Secret"
 msgstr ""
+"De geheime code voor een Toegangstoken mag niet leeg zijn. Voer een geheime "
+"code in voor een Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
-msgstr ""
+msgstr "Klik om het Toegangstoken te testen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:111
@@ -14319,21 +14618,23 @@
 "your behalf (<a href=\"{0}\">more info...</a>)."
 msgstr ""
+"Met OAuth geeft u JOSM het recht om kaartgegevens en GPS-sporen ten behoeve "
+"van uzelf te uploaden (<a href=\"{0}\">meer info...</a>)."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:122
 msgid "Please select an authorization procedure: "
-msgstr ""
+msgstr "Selecteer een procedure voor autorisatie: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:240
 #, java-format
 msgid "Get an Access Token for ''{0}''"
-msgstr ""
+msgstr "Verkrijg een Toegangstoken voor ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
 msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "Sluit het dialoogvenster en annuleer het autoriseren"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
 msgid "Close the dialog and accept the Access Token"
-msgstr ""
+msgstr "Sluit het dialoogvenster en accepteer het Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:97
@@ -14342,19 +14643,20 @@
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
+"Waarschuwing: annuleren van het uitvoeren van de bewerking van OAuth mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:127
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
-msgstr ""
+msgstr "Verkrijgen van Verzoektoken van OAuth vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:160
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr ""
+msgstr "Verkrijgen van Toegangstoken van OAuth vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:294
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
-msgstr ""
+msgstr "Website van OSM gaf geen sessie-cookie terug in antwoord op ''{0}'',"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:345
@@ -14362,9 +14664,11 @@
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
+"Authenticeren mislukt van gebruiker ''{0}'' met wachtwoord ''***'' als "
+"gebruiker van OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:432
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
-msgstr ""
+msgstr "Autoriseren mislukt van verzoek van OAuth  ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:479
@@ -14372,43 +14676,48 @@
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr ""
+"Autoriseren van Verzoektoken van OAuth ''{0}'' op de website van OSM ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:481
 msgid "Initializing a session at the OSM website..."
-msgstr ""
+msgstr "Initialiseren van een sessie op de website van OSM..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "Authenticeren van de sessie voor gebruiker ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
 #, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr ""
+msgstr "Autoriseren van verzoektoken ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
 #, java-format
 msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Uitloggen voor sessie ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
 msgid "Allow to upload map data"
-msgstr ""
+msgstr "Uploaden van kaartgegevens toestaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
 msgid "Select to grant JOSM the right to upload map data on your behalf"
 msgstr ""
+"Selecteer dit om JOSM het recht te geven om kaartgegevens te uploaden ten "
+"behoeve van uzelf"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
 msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "Uploaden van GPS-sporen toestaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
 msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
 msgstr ""
+"Selecteer dit om JOSM het recht te geven om GPS-sporen te uploaden ten "
+"behoeve van uzelf"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
 msgid "Allow to download your private GPS traces"
-msgstr ""
+msgstr "Downloaden van uw private GPS-sporen toestaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
@@ -14417,24 +14726,30 @@
 "layers"
 msgstr ""
+"Selecteer dit om JOSM het recht te geven om uw private GPS-sporen te "
+"downloaden in lagen van JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
 msgid "Allow to read your preferences"
-msgstr ""
+msgstr "Lezen van uw voorkeuren toestaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
 msgid "Select to grant JOSM the right to read your server preferences"
 msgstr ""
+"Selecteer dit om JOSM het recht te geven om uw voorkeuren voor de server te "
+"lezen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Schrijven van uw voorkeuren toestaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
 msgstr ""
+"Selecteer dit om JOSM het recht te geven om uw voorkeuren voor de server weg "
+"te schrijven"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
 msgid "Retrieving OAuth Access Token..."
-msgstr ""
+msgstr "Verkrijgen van Toegangstoken van OAuth..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
@@ -14442,13 +14757,15 @@
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
+"<html>Verkrijgen van een Toegangstoken van OAuth vanaf ''{0}'' mislukt.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "Verzoek mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
 msgid "Retrieving OAuth Request Token..."
-msgstr ""
+msgstr "Verkrijgen van Verzoektoken voor OAuth..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
@@ -14456,14 +14773,15 @@
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
 msgstr ""
+"<html>Verkrijgen van een Verzoektoken van OAuth vanaf ''{0}'' mislukt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:79
 msgid "Display Advanced OAuth Parameters"
-msgstr ""
+msgstr "Uitgebreide parameters voor OAuth weergeven"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
 msgid "Retrieve Request Token"
-msgstr ""
+msgstr "Verzoektoken verkrijgen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
@@ -14473,16 +14791,18 @@
 "Token from ''{1}''.</html>"
 msgstr ""
+"<html>Klik op <strong>{0}</strong> om een Verzoektoken voor OAuth te "
+"verkrijgen vanaf ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr ""
+msgstr "<html>Stap 1/3: Verkrijg een Verzoektoken van OAuth</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
 msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr ""
+msgstr "<html>Stap 2/3: Autoriseer en verkrijg een Toegangstoken</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
-msgstr ""
+msgstr "Verzoek Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
@@ -14497,13 +14817,20 @@
 "</html>"
 msgstr ""
+"<html>JOSM verkreeg met succes een Verzoektoken. JOSM start nu een pagina "
+"voor autorisatie in een externe browser. Log in met uw gebruikersnaam en "
+"wachtwoord voor OSM en volg de instructies om het Verzoektoken te "
+"autoriseren. Schakel dan terug naar dit dialoogvenster en klik op <strong>{0}"
+"</strong><br><br>Als het starten van de externe browser niet lukt kunt u de "
+"volgende URL voor autorisatie kopiëren en die in de adresbalk van uw browser "
+"plakken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Ga terug naar stap 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr ""
+msgstr "<html>Stap 3/3: Met succes een Toegangstoken verkregen</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
@@ -14513,24 +14840,27 @@
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
+"<html>JOSM heeft met succes een Toegangstoken verkregen. U kunt nu dit token "
+"accepteren. JOSM zal het in de toekomst gebruiken voor het authentiseren en "
+"autoriseren bij de server van OSM.<br><br>Het toegangstoken is: </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
-msgstr ""
+msgstr "Opnieuw starten"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "Klik om een Verzoektoken te verkrijgen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Toegangstoken verkrijgen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "Klik om een Toegangstoken te verkrijgen"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
 msgid "Testing OAuth Access Token"
-msgstr ""
+msgstr "Testen van Toegangstoken van OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
@@ -14538,4 +14868,6 @@
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
 msgstr ""
+"Verkrijgen van details over de gebruiker met de sleutel ''{0}'' voor het "
+"Toegangstoken werd verworpen."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
@@ -14543,4 +14875,6 @@
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
+"Verkrijgen van details over de gebruiker met de sleutel ''{0}'' voor het "
+"Toegangstoken werd geweigerd."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
@@ -14551,8 +14885,11 @@
 "''{3}''.</html>"
 msgstr ""
+"<html>Toegangstoken ''{0}'' met succes gebruikt om<br>toegang te krijgen tot "
+"de server van OSM op ''{1}''.<br>U verkrijgt toegang tot de server van OSM "
+"als gebruiker ''{2}'' met ID ''{3}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
 msgid "Success"
-msgstr ""
+msgstr "Succes"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
@@ -14564,4 +14901,8 @@
 "token.</html>"
 msgstr ""
+"<html>Toegang verkrijgen tot de server van OSM ''{0}'' mislukt<br>met het "
+"Toegangstoken ''{0}''.<br>De server verwierp het Toegangstoken als niet-"
+"geautoriseerd. U kunt geen<br>toegang krijgen tot enige beveiligde bron op "
+"deze server met behulp van dit token.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
@@ -14570,5 +14911,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
 msgid "Test failed"
-msgstr ""
+msgstr "Test mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
@@ -14581,8 +14922,14 @@
 "resources.</html>"
 msgstr ""
+"<html>Het Toegangstoken ''{1}'' is bekend bij de  server van OSM ''{0}''."
+"<br>De test om details van de gebruiker te verkrijgen voor dit token "
+"mislukte echter.<br>Afhankelijk van welke rechten aan dit token werden "
+"toegekend kunt u het, niettegenstaande dat, gebruiken<br>om gegevens te "
+"uploaden, GPS-sporen te uploaden en/of toegang te krijgen tot andere "
+"beveiligde bronnen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
 msgid "Token allows restricted access"
-msgstr ""
+msgstr "Token staat beperkte toegang toe"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
@@ -14594,4 +14941,9 @@
 "Carefully check the server<br>URL and your Internet connection.</html>"
 msgstr ""
+"<html>Informatie over de huidige gebruiker van de server van OSM ''{0}'' is "
+"mislukt.<br>Dit is waarschijnlijk geen probleem dat werd veroorzaakt door "
+"het geteste Toegangstoken, maar<br>meer een probleem met de configuratie van "
+"de server. Controleer zorgvuldig de server<br>URL en uw verbinding met "
+"internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
@@ -14601,4 +14953,6 @@
 "''{1}''.<br>The token ist probably invalid.</html>"
 msgstr ""
+"<html>Mislukt om het verzoek te ondertekenen voor de server van OSM ''{0}'' "
+"met het token ''{1}''.<br>Het token is waarschijnlijk ongeldig.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
@@ -14608,83 +14962,87 @@
 "</html>"
 msgstr ""
+"<html>De test mislukte omdat de server antwoordde met een interne fout."
+"<br>JOSM kon niet bepalen of het token ongeldig is. Probeer het later "
+"opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
 msgid "Retrieving user info..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
+msgstr "Verkrijgen van info over gebruiker..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722
 msgid "Menu Name"
 msgstr "Menunaam"
 
-#: ../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
+msgstr "Naamloze laag (lucht)foto"
+
+#: ../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
+msgstr "Service URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:106
 msgid "Get Layers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143
+msgstr "Lagen verkrijgen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:144
 msgid ""
 "That layer does not support any of JOSM''s projections,\n"
 "so you can not use it. This message will not show again."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145
+"Die laag ondersteunt geen projecties van JOSM,\n"
+"dus u kunt het niet gebruiken. Dit bericht zal niet meer worden weergegeven."
+
+#: ../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 "WMS-fout"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:179
+msgid "Show Bounds"
+msgstr "Grenzen weergeven"
+
 #: ../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
+msgstr "Er werd geen omvattend gebied gevonden voor deze laag."
+
+#: ../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
+msgstr "TMS-URL"
+
+#: ../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
+msgstr "Inzoomen"
+
+#: ../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
+msgstr "TMS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722
 msgid "Imagery URL"
 msgstr "URL voor achtergrondafbeeldingen/luchtfotografie"
 
-#: ../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
+msgstr "Kon geen lijst met WMS-lagen ontleden."
+
+#: ../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
+msgstr "Ongeldige service-URL."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:348
 msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Kon geen lijst met WMS-lagen verkrijgen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:52
@@ -14694,5 +15052,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 msgid "Setting Preference entries directly. Use with caution!"
-msgstr "Voorkeuren direct instellen. Voorzichtig gebruiken!"
+msgstr "Items voor Voorkeuren direct instellen. Voorzichtig gebruiken!"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:56
@@ -14700,5 +15058,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
 msgid "Search: "
-msgstr ""
+msgstr "Zoeken: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
@@ -14717,50 +15075,52 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:241
 msgid "Enter a new key/value pair"
-msgstr "Nieuw sleutel/waardepaar invoeren"
+msgstr "Nieuw sleutel/waarde-paar invoeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:263
 msgid "Change a key/value pair"
-msgstr ""
+msgstr "Wijzig een sleutel/waarde-paar"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:281
 msgid "Values"
-msgstr ""
+msgstr "Waarden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
 msgid "Display the Audio menu."
-msgstr "Het geluidsmenu tonen."
+msgstr "Het menu Geluid tonen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
 msgid "Label audio (and image and web) markers."
-msgstr "Geluids- (en afbeeldings- en web-)markers labelen."
+msgstr "Geluids- (en afbeeldings- en web-)markeringen labelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
 msgid "Display live audio trace."
-msgstr "Live-geluidsspoor tonen."
+msgstr "Live geluidsspoor tonen."
 
 #. various methods of making markers on import audio
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with valid timestamps."
-msgstr "Expliciete waypoints met geldige tijdsaanduiding."
+msgstr "Expliciete wegpunten met geldige tijdsaanduiding."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Explicit waypoints with time estimated from track position."
-msgstr "Expliciete waypoints met tijdsschatting uit trackpositie."
+msgstr "Expliciete wegpunten met schatting van tijd uit positie op spoor."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Named trackpoints."
-msgstr "Benoemde trackpunten."
+msgstr "Benoemde punten op spoor."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Modified times (time stamps) of audio files."
-msgstr "Aangepaste tijden (tijdsmarkeringen) van geluidsbestanden."
+msgstr "Aangepaste tijden (tijdstempels) van geluidsbestanden."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
+msgstr ""
+"Begin van spoor (doet dit altijd als geen andere markeringen beschikbaar "
+"zijn)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
 msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "De geluidsmenuitem op de hoofdmenubalk tonen of verbergen."
+msgstr "De items voor menu Geluid in het hoofdmenu tonen of verbergen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
@@ -14769,6 +15129,6 @@
 "the audio currently playing was recorded."
 msgstr ""
-"Een bewegende pictogram tonen die staat voor het opnamepunt op de "
-"gesynchroniseerde track van het klinkende geluid."
+"Een bewegend pictogram tonen dat staat voor het punt op het "
+"gesynchroniseerde spoor waar het momenteel afgespeelde geluid werd opgenomen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
@@ -14777,16 +15137,15 @@
 "button icons."
 msgstr ""
-"Tekstlabels tegen geluids- (en afbeeldings- en web-)markers plaatsen almede "
-"hun knoppictogrammen."
+"Plaats tekstlabels bij geluids- (en afbeeldings- en web-)markeringen alsmede "
+"hun pictogrammen voor knoppen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:66
 msgid "When importing audio, make markers from..."
-msgstr "Bij importeren van geluid, maak markers van..."
+msgstr "Bij importeren van geluid, maak markeringen van..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:70
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
-"Bij importeren van geluid, pas het toe op ieder waypoint in de GPX-laag."
+msgstr "Bij importeren van geluid, pas het toe op elk wegpunt in de GPX-laag."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
@@ -14796,6 +15155,6 @@
 "waypoints) with names or descriptions."
 msgstr ""
-"Van trackpunten automatisch geluidsmarkers maken (in plaats van waypoints) "
-"met namen of beschrijvingen."
+"Van punten op het spoor automatisch geluidsmarkeringen met namen of "
+"beschrijvingen maken (in plaats van wegpunten)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
@@ -14804,6 +15163,6 @@
 "modified time of each audio WAV file imported."
 msgstr ""
-"Geluidsmarkers aanmaken op de positie van de track die overeenkomt met de "
-"aangepast tijd van ieder geïmporteerd WAV-bestand."
+"Geluidsmarkeringen maken op de positie van het spoor dat overeenkomt met de "
+"aangepast tijd van elk geïmporteerd WAV-bestand."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
@@ -14817,10 +15176,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
 msgid "Forward/back time (seconds)"
-msgstr "Vooruit-/achteruittijd (seconden)"
+msgstr "Tijd vooruit-/achteruit (seconden)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
-"De waarde waarmee de snelheid is vermenigvuldigd voor snel doorspoelen."
+"De waarde waarmee de snelheid wordt vermenigvuldigd voor snel doorspoelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
@@ -14834,5 +15193,5 @@
 msgstr ""
 "Afspelen start dit aantal seconden voor (of na, indien negatief) de gewenste "
-"geluidsspoorpositie."
+"positie op het geluidsspoor."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
@@ -14843,17 +15202,18 @@
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
-"De verhouding tussen verstreken tijd van de geluidsopname en de werkelijkheid"
+"De verhouding tussen verstreken tijd van de geluidsopname en de werkelijke "
+"tijd"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
 msgid "Voice recorder calibration"
-msgstr "Calibratie geluidsopname"
+msgstr "Kalibreren van geluidsrecorder"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:45
 msgid "Auto save enabled"
-msgstr ""
+msgstr "Automatisch opslaan ingeschakeld"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
 msgid "Auto save interval (seconds)"
-msgstr ""
+msgstr "Interval automatisch opslaan (seconden)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
@@ -14861,9 +15221,9 @@
 #, java-format
 msgid "Default value: {0}"
-msgstr ""
+msgstr "Standaard waarde: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
 msgid "Auto saved files per layer"
-msgstr ""
+msgstr "Automatisch opgeslagen bestanden per laag"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64
@@ -14873,13 +15233,16 @@
 "tries to recover the unsaved changes on next start.)</i>"
 msgstr ""
+"<i>(Automatisch opslaan slaat gewijzigde gegevenslagen op met periodieke "
+"intervallen. De backups worden opgeslagen in de voorkeursmap van JOSM. In "
+"het geval van een crash probeert JOSM de niet-opgeslagen wijzigingen te "
+"herstellen bij de volgende keer opstarten.)</i>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72
 msgid "Keep backup files when saving data layers"
-msgstr ""
+msgstr "Behoud de back-upbestanden bij het opslaan van gegevenslagen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:74
 msgid "When saving, keep backup files ending with a ~"
-msgstr ""
-"Tijdens het opslaan worden backupbestanden, eindigend op een ~, behouden."
+msgstr "Behoud, bij het opslaan, back-upbestanden die eindigen op ~"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:78
@@ -14888,12 +15251,14 @@
 "the file name and saves it in the same folder.)</i>"
 msgstr ""
+"<i>(JOSM kan een back-upbestand behouden bij het opslaan van gegevenslagen. "
+"Het voegt ''~'' toe aan de bestandsnaam en slaat het op in dezelfde map.)</i>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
 msgid "File backup"
-msgstr ""
+msgstr "Bestand back-up"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99
 msgid "Configure whether to create backup files"
-msgstr ""
+msgstr "Configureer of back-upbestanden moeten worden gemaakt"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:73
@@ -14906,5 +15271,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}"
@@ -14913,9 +15278,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
 msgid "Set to default"
-msgstr "Naar standaardwaarde zetten"
+msgstr "Op standaardwaarde instellen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168
 msgid "Set all to default"
-msgstr "Alles naar standaardwaarde zetten"
+msgstr "Alles op standaardwaarde instellen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:221
@@ -14930,5 +15295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:59
 msgid "Draw Direction Arrows"
-msgstr "Teken richting pijlen."
+msgstr "Teken richtingpijlen."
 
 #. only on the head of a way
@@ -14940,5 +15305,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Draw oneway arrows."
-msgstr ""
+msgstr "Teken éénrichting-pijlen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
@@ -14948,13 +15313,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
 msgid "Draw boundaries of downloaded data"
-msgstr "Grenzen gedownload gebied tekenen"
+msgstr "Teken grenzen van gedownload gebied"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
 msgid "Draw virtual nodes in select mode"
-msgstr "Virtuele knopen in selectiemodus tekenen"
+msgstr "Teken virtuele knopen in modus Selectie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 msgid "Draw inactive layers in other color"
-msgstr "Inactieve lagen in andere kleur tekenen"
+msgstr "Teken inactieve lagen in andere kleur"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
@@ -14964,5 +15329,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Draw only outlines of areas"
-msgstr ""
+msgstr "Teken alleen omtrekken van gebieden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
@@ -14972,5 +15337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Draw direction hints for way segments."
-msgstr "Richtingwijzers voor wegsegmenten tekenen."
+msgstr "Teken aanwijzingen voor richting voor wegsegmenten."
 
 #. draw oneway arrows
@@ -14978,9 +15343,11 @@
 msgid "Draw arrows in the direction of oneways and other directed features."
 msgstr ""
+"Teken pijlen in de richting van één-richting en andere opgegeven "
+"mogelijkheden."
 
 #. segment order number
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:78
 msgid "Draw the order numbers of all segments within their way."
-msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
+msgstr "Teken de volgordenummers van alle segmenten binnen hun weg."
 
 #. antialiasing
@@ -14988,11 +15355,11 @@
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
-"Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
-"gevolg."
+"Anti-aliasing op de kaartweergave toepassen, met een vloeiender uiterlijk "
+"als gevolg."
 
 #. downloaded area
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:88
 msgid "Draw the boundaries of data loaded from the server."
-msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
+msgstr "Teken de grenzen van de gegevens die geladen zijn van de server."
 
 #. virtual nodes
@@ -15000,10 +15367,10 @@
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
-"Virtuele knopen in geselecteerde modus tekenen voor eenvoudigere bewerking."
+"Teken virtuele knopen in modus Selectie voor eenvoudig aanpassen van weg."
 
 #. background layers in inactive color
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:98
 msgid "Draw the inactive data layers in a different color."
-msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
+msgstr "Teken de inactieve gegevenslagen in een andere kleur."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
@@ -15012,4 +15379,6 @@
 "in the selected style."
 msgstr ""
+"Deze optie onderdrukt het vullen van gebieden, overschrijft daarmee alles "
+"wat gespecificeerd is in de geselecteerde stijl."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
@@ -15019,5 +15388,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:36
 msgid "Auto"
-msgstr ""
+msgstr "Auto"
 
 #. gpx data field name
@@ -15025,5 +15394,5 @@
 msgctxt "gpx_field"
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. gpx data field name
@@ -15031,17 +15400,17 @@
 msgctxt "gpx_field"
 msgid "Desc(ription)"
-msgstr ""
+msgstr "Be(schrijving)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Everything"
-msgstr ""
+msgstr "Alles"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Name or offset"
-msgstr ""
+msgstr "Naam van verschuiving"
 
 #: ../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
@@ -15051,5 +15420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37
 msgid "Custom"
-msgstr ""
+msgstr "Aangepast"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:40
@@ -15070,9 +15439,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:42
 msgid "Local files"
-msgstr ""
+msgstr "Lokale bestanden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:47
 msgid "Force lines if no segments imported."
-msgstr "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn."
+msgstr "Forceer lijnen indien er geen segmenten geïmporteerd zijn."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:48
@@ -15084,5 +15453,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:168
 msgid "Draw a circle form HDOP value."
-msgstr ""
+msgstr "Teken een cirkelvorm HDOP-waarde."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:51
@@ -15092,5 +15461,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:52
 msgid "Direction (red = west, yellow = north, green = east, blue = south)"
-msgstr ""
+msgstr "Richting (rood = west, geel = noord, groen = oost, blauw = zuid)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:53
@@ -15100,5 +15469,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:54
 msgid "Track date"
-msgstr ""
+msgstr "Datum spoor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:55
@@ -15109,5 +15478,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"
@@ -15133,14 +15502,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 "Fiets"
@@ -15179,13 +15548,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 "Te voet"
@@ -15193,13 +15562,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:58
 msgid "Create markers when reading GPX."
-msgstr ""
+msgstr "Maak markeringen bij het lezen van GPX."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:60
 msgid "Fast drawing (looks uglier)"
-msgstr "Sneltekenen (minder fraai)"
+msgstr "Snel tekenen (minder fraai)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:62
 msgid "Dynamic color range based on data limits"
-msgstr ""
+msgstr "Dynamisch kleurbereik gebaseerd op grenzen van gegevens"
 
 #. makeAutoMarkers
@@ -15209,11 +15578,11 @@
 "layer."
 msgstr ""
-"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
-"een GPX-laag."
+"Automatisch een markeringslaag voor elk wegpunt maken bij het openen van een "
+"GPX-laag."
 
 #. ensure that default is in data base
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:105
 msgid "Draw lines between raw GPS points"
-msgstr ""
+msgstr "Teken lijnen tussen ruwe GPS-punten."
 
 #. drawRawGpsMaxLineLengthLocal
@@ -15223,8 +15592,10 @@
 "draw all lines."
 msgstr ""
+"Maximale lengte (in meters) om lijnen te tekenen voor lokale bestanden. Stel "
+"in op ''-1'' om alle lijnen te tekenen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:136
 msgid "Maximum length for local files (meters)"
-msgstr ""
+msgstr "Maximale lengte voor lokale bestanden (meters)"
 
 #. drawRawGpsMaxLineLength
@@ -15233,10 +15604,10 @@
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
-"Maximum lengte (in meters) om lijnen tekenen. Kies ''-1'' om alle lijnen "
-"tekenen."
+"Maximale lengte (in meters) om lijnen te tekenen. Stel in op ''-1'' om alle "
+"lijnen te tekenen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:141
 msgid "Maximum length (meters)"
-msgstr "Maximum lengte (meters)"
+msgstr "Maximale lengte (meters)"
 
 #. forceRawGpsLines
@@ -15245,10 +15616,10 @@
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
-"Forceer tekenen van lijnen als de geïmporteerde gegevens geen lijninformatie "
-"bevatten."
+"Forceer tekenen van lijnen als de geïmporteerde gegevens geen informatie "
+"over de lijn bevatten."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:155
 msgid "Draw direction arrows for lines, connecting GPS points."
-msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
+msgstr "Teken richtingpijlen voor lijnen, verbind de GPS-punten."
 
 #. drawGpsArrowsFast
@@ -15256,5 +15627,5 @@
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
-"De richtingspijlen tekenen door te zoeken in tabellen i.p.v. ingewikkelde "
+"Teken de richtingpijlen door te zoeken in tabellen i.p.v. ingewikkelde "
 "wiskunde."
 
@@ -15269,10 +15640,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:164
 msgid "Minimum distance (pixels)"
-msgstr "Minimum afstand (pixels)"
+msgstr "Minimale afstand (pixels)"
 
 #. largeGpsPoints
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:172
 msgid "Draw larger dots for the GPS points."
-msgstr "De GPS-punten groter tekenen."
+msgstr "Teken grotere punten voor de GPS-punten."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:198
@@ -15281,14 +15652,14 @@
 "Layer Manager."
 msgstr ""
-"Alle punten en tracksegmenten zullen dezelfde kleur hebben. Kan worden "
-"ingesteld in Laagbeheer."
+"Alle punten en segmenten van het spoor zullen dezelfde kleur hebben. Kan "
+"worden ingesteld in Beheer lagen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:199
 msgid "Colors points and track segments by velocity."
-msgstr "Kleur punten en tracksegmenten op basis van snelheid."
+msgstr "Kleur punten en segmenten van het spoor op basis van snelheid."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:200
 msgid "Colors points and track segments by direction."
-msgstr ""
+msgstr "Kleur punten en segmenten van het spoor op basis van richting."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:201
@@ -15297,8 +15668,10 @@
 "capture device needs to log that information."
 msgstr ""
+"Kleur punten en segmenten van het spoor op basis van positie (HDOP). Het "
+"apparaat waarmee u opneemt moet die informatie opslaan."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:202
 msgid "Colors points and track segments by its timestamp."
-msgstr ""
+msgstr "Kleur punten en segmenten van het spoor op basis van hun tijdstempel."
 
 #. color Tracks by Velocity Tune
@@ -15306,13 +15679,16 @@
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
-"Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
+"Sta toe om de kleur van het spoor af te stemmen op de verschillende "
+"gemiddelde snelheden."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:209
 msgid "Track and Point Coloring"
-msgstr "Track- en puntkleuring"
+msgstr "Kleuren van sporen en punten"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:220
 msgid "Colors points and track segments by data limits."
 msgstr ""
+"Kleur punten en segmenten van het spoor op basis van de grenzen van hun "
+"gegevens."
 
 #. Setting waypoints for gpx layer doesn't make sense - waypoints are shown in marker layer that has different name - so show
@@ -15321,134 +15697,140 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:228
 msgid "Waypoint labelling"
-msgstr ""
+msgstr "Labelen van wegpunten"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:242
 msgid "Audio waypoint labelling"
-msgstr ""
+msgstr "Audio labelen van wegpunten"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
 #, java-format
 msgid "Incorrect waypoint label pattern: {0}"
-msgstr ""
+msgstr "Onjuist patroon voor label wegpunt: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:409
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
 msgid "Incorrect pattern"
-msgstr ""
+msgstr "Onjuist patroon"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:417
 #, java-format
 msgid "Incorrect audio waypoint label pattern: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110
+msgstr "Onjuist patroon voor label audio wegpunt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125
 msgid "imagery fade"
 msgstr "Luchtfoto vervagen"
 
-#: ../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
+msgstr "Kleur voor vervagen: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:140
 msgid "Fade amount: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131
+msgstr "Hoeveelheid vervagen: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:146
 msgid "Soft"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:132
+msgstr "Zacht"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:147
 msgid "Strong"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133
+msgstr "Sterk"
+
+#: ../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
+msgstr "Verscherpen (vereist opnieuw toevoegen laag): "
+
+#: ../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
+msgstr "Gebruik server voor verschuivingen: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:174
 msgid "Downloader:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165
+msgstr "Downloader:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180
 msgid "Overlap tiles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166
+msgstr "Tegels overlappen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181
 msgid "% of east:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167
+msgstr "% oostelijk:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
 msgid "% of north:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182
+msgstr "% noordelijk:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197
 msgid "Simultaneous connections"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:198
+msgstr "Gelijktijdige verbindingen"
+
+#: ../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
+msgstr "Standaard automatisch inzoomen: "
+
+#: ../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
+msgstr "Standaard automatisch laden van tegels: "
+
+#: ../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
+msgstr "Min. zoomniveau: "
+
+#: ../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
+msgstr "Max. zoomniveau: "
+
+#: ../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
+msgstr "Toevoegen aan kiezer voor slippykaart: "
+
+#: ../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
+msgstr "Map voor cache van tegels: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255
 msgid "Common Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
+msgstr "Algemene instellingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256
 msgid "WMS Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242
+msgstr "WMS-instellingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257
 msgid "TMS Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+msgstr "TMS-instellingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Imagery Preferences"
-msgstr "Instellingen voor achtergrondafbeeldingen/luchtfoto’s"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251
+msgstr "Voorkeuren voor achtergrondafbeeldingen/luchtfoto's"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266
 msgid "Modify list of imagery layers displayed in the Imagery menu"
-msgstr "Lijst van achtergrondafbeeldingen/luchtfoto’s aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259
+msgstr ""
+"Lijst van lagen van afbeeldingen die zichtbaar zijn in menu Luchtfotografie "
+"aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274
 msgid "Imagery providers"
-msgstr "Aanbieders van achtergrondafbeeldingen/luchtfoto’s"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261
+msgstr "Aanbieders van afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276
 msgid "Offset bookmarks"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
+msgstr "Bladwijzers voor verschuivingen"
+
+#: ../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
+msgstr "Beschikbare standaard items:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:504
 msgid "Selected entries:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446
+msgstr "Geselecteerde items:"
+
+#: ../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
@@ -15459,55 +15841,55 @@
 msgstr "Nieuw"
 
-#: ../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
+msgstr "Voeg een nieuw WMS/TMS-item toe bij het invoeren van de URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:607
 msgid "Add Imagery URL"
-msgstr "URL voor achtergrondafbeeldingen/luchtfotografie toevoegen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
+msgstr "URL voor afbeeldingen toevoegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:619
 msgid "Remove entry"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:493
+msgstr "Item verwijderen"
+
+#: ../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
+msgstr "kopieer geselecteerde standaarden"
+
+#: ../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
+msgstr "Selecteer ten minste één rij om te kopiëren."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:707
 msgid "reload defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
+msgstr "standaarden herladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785
 msgid "Menu Name (Default)"
 msgstr "Menunaam (standaard)"
 
-#: ../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 "URL voor achtergrondafbeeldingen/luchtfotografie (standaard)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:686
+msgstr "URL voor afbeeldingen (standaard)"
+
+#: ../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
+msgstr "EULA-licentie URL niet beschikbaar: {0}"
+
+#: ../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
+msgstr "Misvormde URL voor de EULA-licentie: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Projection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+msgstr "Projectie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Easting"
 msgstr "Verschuiving in oostelijke richting"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910
 msgid "Northing"
 msgstr "Verschuiving in noordelijke richting"
@@ -15517,5 +15899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79
 msgid "Show splash screen at startup"
-msgstr "Opstartscherm tonen"
+msgstr "Startscherm weergeven bij opstarten"
 
 #. Show ID in selection
@@ -15523,18 +15905,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84
 msgid "Show object ID in selection lists"
-msgstr "Object-id in selectielijsten tonen"
+msgstr "Object-ID in selectielijsten weergeven"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
 msgid "Show localized name in selection lists"
-msgstr ""
+msgstr "Geef de gelokaliseerde naam weer in selectielijsten"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93
 msgid "Draw rubber-band helper line"
-msgstr "Elastische hulplijn tekenen"
+msgstr "Teken elastische hulplijn"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
 msgid "Modeless working (Potlatch style)"
-msgstr ""
+msgstr "Zonder modus werken (stijl van Potlatch)"
 
 #. Show localized names
@@ -15542,13 +15924,14 @@
 msgid "Show localized name in selection lists, if available"
 msgstr ""
+"Geef de gelokaliseerde naam weer in selectielijsten, indien beschikbaar"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
 msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr ""
+msgstr "Wijzigen van modus niet vereisen (werkstroom in stijl van Potlatch)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
 msgid "Look and Feel"
-msgstr "Weergave en Vormgeving"
+msgstr "Weergave en vormgeving"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:45
@@ -15562,43 +15945,45 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
-msgstr ""
+msgstr "Schakel standaarden voor ingebouwde pictogrammen in"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:111
 msgid "Available styles:"
-msgstr ""
+msgstr "Beschikbare stijlen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:113
 msgid "Active styles:"
-msgstr ""
+msgstr "Actieve stijlen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:115
 msgid "Add a new style by entering filename or URL"
-msgstr ""
+msgstr "Voeg een nieuwe stijl toe door een bestandsnaam of URL in te voeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:117
 msgid "New style entry:"
-msgstr ""
+msgstr "Nieuw item stijl:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:119
 msgid "Remove the selected styles from the list of active styles"
-msgstr ""
+msgstr "Verwijder de geselecteerde stijlen uit de lijst met actieve stijlen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:121
 msgid "Edit the filename or URL for the selected active style"
-msgstr ""
+msgstr "Bewerk de bestandsnaam of URL voor de geselecteerde actieve stijl"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:123
 msgid "Add the selected available styles to the list of active styles"
 msgstr ""
+"Voeg de geselecteerde beschikbare stijlen toe aan de lijst van actieve "
+"stijlen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:125
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Laadt opnieuw de lijst met beschikbare stijlen vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:127
 #, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr ""
+msgstr "Laad stijlbronnen vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:129
@@ -15608,4 +15993,6 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
+"<html>Laden mislukt van de lijst met stijlbronnen vanaf<br>''{0}''."
+"<br><br>Details (niet vertaald):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:136
@@ -15613,20 +16000,24 @@
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr ""
+"Waarschuwing: ongeldige indeling van item in de lijst met stijlen ''{0}''. "
+"Kreeg ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244
 msgid "JOSM Internal Style"
-msgstr ""
+msgstr "JOSM interne stijl"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245
 msgid "Internal style to be used as base for runtime switchable overlay styles"
 msgstr ""
+"Interne stijl die moet worden gebruikt als basis voor runtime schakelbare "
+"overtrek-stijlen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249
 msgid "Potlatch 2"
-msgstr ""
+msgstr "Potlatch 2"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:250
 msgid "the main Potlatch 2 style"
-msgstr ""
+msgstr "de belangrijkste stijl van Potlatch 2"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:69
@@ -15644,27 +16035,27 @@
 msgid_plural ""
 "Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] "Het downloaden van de volgende plugin is <strong>mislukt</strong>:"
+msgstr[0] "Het downloaden van de volgende plug-in is <strong>mislukt</strong>:"
 msgstr[1] ""
-"Het downloaden van de volgende {0} plugins is <strong>mislukt</strong>:"
+"Het downloaden van de volgende {0} plug-ins is <strong>mislukt</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:117
 msgid "Search:"
-msgstr "Zoek:"
+msgstr "Zoeken:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:122
 msgid "Enter a search expression"
-msgstr ""
+msgstr "Voer een uitdrukking om te zoeken in"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:168
 msgid "Plugin update policy"
-msgstr "Beleid voor het bijwerken van plugins"
+msgstr "Beleid voor het bijwerken van plug-ins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:190
 msgid "Accept the new plugin sites and close the dialog"
-msgstr "Aanvaard de nieuwe plugin-sites en sluit de dialoog"
+msgstr "Aanvaard de nieuwe sites voor plug-ins en sluit het dialoogvenster"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:205
 msgid "Configure Plugin Sites"
-msgstr "Plugin-site configureren"
+msgstr "Site voor plug-in configureren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:270
@@ -15674,5 +16065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:271
 msgid "Download the list of available plugins"
-msgstr "Download de lijst met beschikbare plugins"
+msgstr "Download de lijst met beschikbare plug-ins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:299
@@ -15684,13 +16075,13 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:928
 msgid "Update plugins"
-msgstr "Plugins bijwerken"
+msgstr "Plug-ins bijwerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:300
 msgid "Update the selected plugins"
-msgstr "De geselekteerde plugins bijwerken"
+msgstr "De geselecteerde plug-ins bijwerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:311
 msgid "Please restart JOSM to activate the downloaded plugins."
-msgstr "Gelieve JOSM te herstarten om de gedownloade plugins te aktiveren."
+msgstr "Start JOSM opnieuw op om de gedownloade plug-ins te activeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -15699,6 +16090,6 @@
 "versions."
 msgstr ""
-"Alle plugins zijn reeds bijgewerkt. JOSM moet geen nieuwere versies "
-"downloaden."
+"Alle geïnstalleerde plug-ins zijn bijgewerkt. JOSM hoeft geen nieuwere "
+"versies te downloaden."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
@@ -15708,31 +16099,31 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:395
 msgid "Configure sites..."
-msgstr "Instellen sites..."
+msgstr "Configureren van sites..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:396
 msgid "Configure the list of sites where plugins are downloaded from"
-msgstr "Instellen van de lijst met sites voor het downloaden van plugins"
+msgstr "Instellen van de lijst met sites voor het downloaden van plug-ins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:458
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:470
 msgid "Add JOSM Plugin description URL."
-msgstr "Voeg URL toe voor de beschrijving van de JOSM-plugin"
+msgstr "Voeg URL toe voor de beschrijving van de JOSM plug-in"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
 msgid "Enter URL"
-msgstr "Geef URL in"
+msgstr "Voer URL in"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 msgid "Please select an entry."
-msgstr "Selecteer een invoer."
+msgstr "Selecteer een item."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:492
 msgid "Edit JOSM Plugin description URL."
-msgstr "Wijzig URL voor de beschrijving van de JOSM-plugin"
+msgstr "Wijzig URL voor de beschrijving van de JOSM plug-in"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:493
 msgid "JOSM Plugin description URL"
-msgstr "URL voor de beschrijving van de JOSM-plugin"
+msgstr "URL voor de beschrijving van de JOSM plug-in"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:48
@@ -15742,5 +16133,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:49
 msgid "no modifier"
-msgstr "geen aanpastoets"
+msgstr "geen toets voor aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:160
@@ -15753,7 +16144,7 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
-"<p>Gelieve nota te nemen dat de sneltoetsen pas toegewezen worden aan de "
-"akties wanneer JOSM wordt gestart. Om je wijzigingen te zien, dien je JOSM "
-"te <b>herstarten</b>.</p>"
+"<p>Onthoud dat sneltoetsen aan de acties worden toegewezen als JOSM wordt "
+"gestart. U moet dus JOSM <b>opnieuw starten</b> om uw wijzigingen te zien.</"
+"p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:163
@@ -15765,4 +16156,9 @@
 "</p>"
 msgstr ""
+"<p>Verder worden de sneltoetsen geactiveerd als de acties voor de eerste "
+"keer worden toegewezen aan een menu-item of een knop. Dus kunnen sommige van "
+"uw wijzigingen zelfs actief worden zonder opnieuw te starten --- maar ook "
+"zonder afhandeling van eventuele conflicten. Dit is een andere reden om JOSM "
+"<b>opnieuw te starten</b> nadat hier enkele wijzigingen zijn gemaakt.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
@@ -15780,8 +16176,20 @@
 "p>"
 msgstr ""
+"<p>Het kan u zijn opgevallen dat de selectielijst met toetsen op de volgende "
+"pagina alle toetsen opsomt die bestaan op alle soorten toetsenborden die "
+"bekend zijn bij Java, niet alleen de toetsen die op uw toetsenbord bestaan. "
+"Gebruik alleen waarden die overeenkomen met een echte toets op uw "
+"toetsenbord. Als uw toetsenbord geen toets ''Copy'' heeft (PC-toetsenborden "
+"hebben die niet, toetsenborden van Sun wel), gebruik die dan niet. Ook "
+"worden er ''toetsen'' vermeld die overeenkomen met een sneltoets op uw "
+"toetsenbord (bijv. '':''/Colon). Gebruik die alstiblieft ook niet, gebruik "
+"in plaats daarvan de basistoets ('';''/Punt komma op US-toetsenborden, ''.''/"
+"Punt op Duitse toetsenborden, etc.). Door dit niet te doen kunnen er "
+"conflicten optreden, omdat er geen manier is waarop JOSM kan weten dat Ctrl"
+"+Shift+; en Ctrl+: eigenlijk hetzelfde is op een US-toetsenbord.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:173
 msgid "<h1>Modifier Groups</h1>"
-msgstr "<h1>Groepen aanpastoetsen</h1>"
+msgstr "<h1>Groepen toetsen voor aanpassen</h1>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:174
@@ -15793,4 +16201,10 @@
 "already taken, it will assign a random shortcut instead.</p>"
 msgstr ""
+"<p>De laatste pagina vermeld de toetsen voor aanpassen die JOSM automatisch "
+"zal toewijzen aan sneltoetsen. Voor elk van de vier soorten sneltoetsen "
+"bestaan drie alternatieven. JOSM zal deze alternatieven proberen in de "
+"vermelde volgorde bij het afhandelen van een conflict. Indien alle "
+"alternatieven resulteren in sneltoetsen die al bezet zijn, zal het in plaats "
+"daarvan een willekeurige sneltoets toewijzen.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
@@ -15799,5 +16213,5 @@
 "encountered.</p>"
 msgstr ""
-"<p>De pseudo-aanpasser ''uitgeschakeld'' zal de sneltoets uitschakelen als "
+"<p>De pseudo-aanpastoets ''uitgeschakeld'' zal de sneltoets uitschakelen als "
 "het deze tegenkomt.</p>"
 
@@ -15823,5 +16237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:236
 msgid "Attention: Use real keyboard keys only!"
-msgstr "Let op: gebruik alleen bestaande toetsen op het toetsenbord!"
+msgstr "Let op: Gebruik alleen bestaande toetsen op het toetsenbord!"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:243
@@ -15868,18 +16282,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:356
 msgid "Modifier Groups"
-msgstr "Groepen aanpastoetsen"
+msgstr "Groepen toetsen voor aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106
 msgid "Close the preferences dialog and discard preference updates"
 msgstr ""
+"Sluit het dialoogvenster Voorkeuren en verwerp het bijwerken van de "
+"voorkeuren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:124
 msgid "Save the preferences and close the dialog"
-msgstr ""
+msgstr "Sla de voorkeuren op en sluit het dialoogvenster"
 
 #. some common tabs
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:58
 msgid "Display Settings"
-msgstr "Beeldscherminstellingen"
+msgstr "Weergaveinstellingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:58
@@ -15896,5 +16312,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:59
 msgid "Connection Settings for the OSM server."
-msgstr "Verbindingsinstellingen voor de OSM-server."
+msgstr "Verbindingsinstellingen voor de server van OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:60
@@ -15904,5 +16320,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:60
 msgid "Settings for the map projection and data interpretation."
-msgstr "Instellingen voor kaartprojectie en interpretatie van gegevens."
+msgstr "Instellingen voor projectie van kaarten en interpretatie van gegevens."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:61
@@ -15912,17 +16328,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:61
 msgid "Settings for the audio player and audio markers."
-msgstr "Instellingen voor de geluidsspeler en geluidsmarkers."
+msgstr "Instellingen voor de geluidsspeler en geluidsmarkeringen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
 msgid "Configure available plugins."
-msgstr "Beschikbare plugins configureren"
+msgstr "Beschikbare plug-ins configureren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:140
 msgid "Download plugins"
-msgstr ""
+msgstr "Download plug-ins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:172
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
+msgstr "U moet JOSM opnieuw starten om sommige instellingen te activeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
@@ -15932,13 +16348,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection code"
-msgstr ""
+msgstr "Projectiecode"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:129
 msgid "Display coordinates as"
-msgstr "Coördinaten tonen als"
+msgstr "Coördinaten weergeven als"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:132
 msgid "System of measurement"
-msgstr ""
+msgstr "Maateenheid"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:138
@@ -15949,37 +16365,37 @@
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
+msgstr "De projectie {0} kan niet worden geactiveerd. Mercator gebruiken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:47
 msgid "Load data from API"
-msgstr ""
+msgstr "Laad gegevens vanaf API"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:48
 msgid "Import data from URL"
-msgstr ""
+msgstr "Importeer gegevens vanaf URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:49
 msgid "Load imagery layers"
-msgstr "Achtergrondafbeeldingen/luchtfotografie laden"
+msgstr "Afbeeldingslagen laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:50
 msgid "Create new objects"
-msgstr ""
+msgstr "Nieuwe objecten maken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:51
 msgid "Change the selection"
-msgstr ""
+msgstr "Wijzig de selectie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:52
 msgid "Change the viewport"
-msgstr ""
+msgstr "Wijzig de weergavepoort"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:53
 msgid "Read protocol version"
-msgstr ""
+msgstr "Lees protocolversie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54
 msgid "Confirm all Remote Control actions manually"
-msgstr ""
+msgstr "Bevestig alle acties van de Afstandsbediening handmatig"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
@@ -15989,9 +16405,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
 msgid "Settings for the remote control feature."
-msgstr ""
+msgstr "Instellingen voor de mogelijkheid voor afstandsbediening."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:60
 msgid "Enable remote control"
-msgstr ""
+msgstr "Afstandsbediening inschakelen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:69
@@ -16000,8 +16416,10 @@
 "applications, e.g. from a web browser."
 msgstr ""
+"De mogelijkheid van afstandsbediening stelt JOSM in staat om te worden "
+"beheerd door andere toepassingen, bijv. vanuit een webbrowser."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:74
 msgid "Permitted actions:"
-msgstr ""
+msgstr "Toegestane acties:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88
@@ -16011,20 +16429,24 @@
 "JOSM."
 msgstr ""
+"JOSM zal altijd luisteren op poort 8111 op localhost. Deze poort is niet te "
+"configureren omdat er naar wordt verwezen door externe toepassingen om te "
+"communiceren met JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64
 msgid "Authentication"
-msgstr ""
+msgstr "Authenticatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
 msgid "Proxy settings"
-msgstr ""
+msgstr "Proxy-instellingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
+"Configureer uw identiteit en hoe te authenticeren bij de server van OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
 msgid "Configure whether to use a proxy server"
-msgstr ""
+msgstr "Configureer of een proxy-server moet worden gebruikt"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -16036,5 +16458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
 msgid "Shortcut Preferences"
-msgstr "Sneltoetsvoorkeuren"
+msgstr "Voorkeuren Sneltoetsen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
@@ -16052,50 +16474,52 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:314
 msgid "Icon paths:"
-msgstr ""
+msgstr "Paden voor pictogrammen:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:635
 #, java-format
 msgid "Short Description: {0}"
-msgstr ""
+msgstr "Korte beschrijving: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:635
 #, java-format
 msgid "URL: {0}"
-msgstr ""
+msgstr "URL: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:637
 #, java-format
 msgid "Author: {0}"
-msgstr ""
+msgstr "Auteur: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:640
 #, java-format
 msgid "Webpage: {0}"
-msgstr ""
+msgstr "Webpagina: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:646
 #, java-format
 msgid "Version: {0}"
-msgstr ""
+msgstr "Versie {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:671
 msgid "Name (optional):"
-msgstr ""
+msgstr "Naam (optioneel):"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:675
 msgid "URL / File:"
-msgstr ""
+msgstr "URL / Bestand:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:689
 msgid "active"
-msgstr ""
+msgstr "actief"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:826
 msgid "Edit source entry:"
-msgstr ""
-
+msgstr "Item van bron bewerken:"
+
+#. 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 "Herstellen"
@@ -16103,17 +16527,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:899
 msgid "Reset to default"
-msgstr ""
+msgstr "Herstellen naar standaard"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1023
 msgid "Add a new icon path"
-msgstr ""
+msgstr "Voeg een nieuw pad voor pictogrammen toe"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1036
 msgid "Remove the selected icon paths"
-msgstr ""
+msgstr "Verwijder het geselecteerde pad voor pictogrammen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1057
 msgid "Edit the selected icon path"
-msgstr ""
+msgstr "Bewerk het geselecteerde pad voor pictogrammen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:65
@@ -16121,4 +16545,6 @@
 msgid "Warning: Could not read tagging preset source: {0}"
 msgstr ""
+"Waarschuwing: Lezen niet mogelijk van de vooraf ingestelde bron voor taggen: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68
@@ -16128,4 +16554,6 @@
 "Do you want to keep it?"
 msgstr ""
+"Lezen niet mogelijk van de vooraf ingestelde bron voor taggen: {0}\n"
+"Wilt u het behouden?"
 
 #. Should not happen, but at least show message
@@ -16133,5 +16561,5 @@
 #, java-format
 msgid "Could not read tagging preset source {0}"
-msgstr ""
+msgstr "Lezen niet mogelijk van de vooraf ingestelde bron voor taggen {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94
@@ -16142,4 +16570,7 @@
 "table></html>"
 msgstr ""
+"<html>Vooraf ingestelde bron voor taggen {0} kan worden geladen maar het "
+"bevat fouten. Wilt u het werkelijk gebruiken?<br><br><table width=600>Fout "
+"is: [{1}:{2}] {3}</table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98
@@ -16149,4 +16580,7 @@
 "it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
 msgstr ""
+"<html>Niet in staat om vooraf ingestelde bron voor taggen: {0} te ontleden. "
+"Wilt u het werkelijk gebruiken?<br><br><table width=400>Fout is: [{1}:{2}] "
+"{3}</table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:104
@@ -16156,4 +16590,7 @@
 "really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
+"<html>Vooraf ingestelde bron voor taggen {0} kan worden geladen maar het "
+"bevat fouten. Wilt u het werkelijk gebruiken?<br><br><table width=600>Fout "
+"is: {1}</table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108
@@ -16163,50 +16600,56 @@
 "it?<br><br><table width=600>Error is: {1}</table></html>"
 msgstr ""
+"<html>Niet in staat om vooraf ingestelde bron voor taggen: {0} te ontleden. "
+"Wilt u het werkelijk gebruiken?<br><br><table width=600>Fout is: {1}</"
+"table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:139
 msgid "Sort presets menu"
-msgstr "Voorinstellingenmenu sorteren"
+msgstr "Menu Voorkeuze sorteren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:147
 msgid "Tagging Presets"
-msgstr "Tagvoorkeuzen"
+msgstr "Vooraf ingestelde tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:211
 msgid "Available presets:"
-msgstr ""
+msgstr "Beschikbare keuzes:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:213
 msgid "Active presets:"
-msgstr ""
+msgstr "Actieve voorkeuzes:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:215
 msgid "Add a new preset by entering filename or URL"
-msgstr ""
+msgstr "Voeg een nieuwe voorkeuze in door een bestandsnaam of URL in te voeren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:217
 msgid "New preset entry:"
-msgstr ""
+msgstr "Nieuw item voorkeuze:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:219
 msgid "Remove the selected presets from the list of active presets"
 msgstr ""
+"Verwijder de geselecteerde voorkeuzes uit de lijst van actieve voorkeuzes"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:221
 msgid "Edit the filename or URL for the selected active preset"
-msgstr ""
+msgstr "Bewerk de bestandsnaam of URL voor de geselecteerde actieve voorkeuze"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:223
 msgid "Add the selected available presets to the list of active presets"
 msgstr ""
+"Voeg de geselecteerde beschikbare voorkeuzes toe aan de lijst met actieve "
+"voorkeuzes"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:225
 #, java-format
 msgid "Reloads the list of available presets from ''{0}''"
-msgstr ""
+msgstr "Laadt de lijst met beschikbare voorkeuzes opnieuw vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:227
 #, java-format
 msgid "Loading preset sources from ''{0}''"
-msgstr ""
+msgstr "Bronnen voor voorkeuze laden vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:229
@@ -16216,4 +16659,6 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
+"<html>Laden mislukt van de lijst met bronnen voor voorkeuze vanaf<br>''{0}''."
+"<br><br>Details (niet vertaald):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:236
@@ -16221,24 +16666,26 @@
 msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
 msgstr ""
+"Waarschuwing: ongeldige indeling van item in lijst met voorkeuzes ''{0}''. "
+"Kreeg ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:331
 msgid "Internal Preset"
-msgstr ""
+msgstr "Interne voorkeuze"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:332
 msgid "The default preset for JOSM"
-msgstr ""
+msgstr "De standaard voorkeuze voor JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:319
 msgid "Tooltip"
-msgstr ""
+msgstr "Helptip"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:319
 msgid "Icon"
-msgstr ""
+msgstr "Pictogram"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:376
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:506
@@ -16257,13 +16704,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:733
 msgid "Action parameters"
-msgstr ""
+msgstr "Parameters voor actie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:734
 msgid "Parameter name"
-msgstr ""
+msgstr "Naam parameter"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:735
 msgid "Parameter value"
-msgstr ""
+msgstr "Waarde parameter"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:740
@@ -16278,33 +16725,33 @@
 #, java-format
 msgid "Toolbar action without name: {0}"
-msgstr ""
+msgstr "Werkbalk-actie zonder naam: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:797
 #, java-format
 msgid "Strange toolbar value: {0}"
-msgstr ""
+msgstr "Vreemde waarde voor werkbalk: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:805
 #, java-format
 msgid "Toolbar action {0} overwritten: {1} gets {2}"
-msgstr ""
+msgstr "Werkbalk-actie {0} overschreven: {1} krijgt {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:890
 #, java-format
 msgid "Registered toolbar action without name: {0}"
-msgstr ""
+msgstr "Geregistreerde werkbalk-actie zonder naam: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:895
 #, java-format
 msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
-msgstr ""
+msgstr "Geregistreerde werkbalk-actie {0} overschreven: {1} krijgt {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:77
 msgid "Use ignore list."
-msgstr "Uitzonderingslijst gebruiken."
+msgstr "Lijst met uitzonderingen gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:78
 msgid "Use the ignore list to suppress warnings."
-msgstr "Gebruik uitzonderingslijst om waarschuwingen te onderdrukken."
+msgstr "Gebruik lijst met uitzonderingen om waarschuwingen te onderdrukken."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:81
@@ -16318,17 +16765,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:85
 msgid "Show informational level."
-msgstr ""
+msgstr "Niveau voor informatie weergeven."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:86
 msgid "Show the informational tests."
-msgstr ""
+msgstr "Testen voor informatie weergeven."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:89
 msgid "Show informational level on upload."
-msgstr "Informatief niveau tijden upload tonen."
+msgstr "Niveau voor informatie weergeven tijdens uploaden."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:90
 msgid "Show the informational tests in the upload check windows."
-msgstr "Informatieve testen in de upload-controleschermen tonen."
+msgstr ""
+"Testen voor informatie weergeven in de controlevensters voor het uploaden."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:103
@@ -16345,6 +16793,6 @@
 "programs."
 msgstr ""
-"Een OSM-gegevensvalidatie die op gebruikelijke fouten van gebruikers en "
-"andere editors controleert."
+"Gegevensvalidatie voor OSM die op gebruikelijke fouten van gebruikers en "
+"andere programma's voor bewerking controleert."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:115
@@ -16354,5 +16802,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:61
 msgid "Plugin bundled with JOSM"
-msgstr "Plugin gebundeld met JOSM"
+msgstr "Plug-in gebundeld met JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:78
@@ -16361,6 +16809,6 @@
 "list of available plugins."
 msgstr ""
-"Gelieve op <strong>Lijst downloads</strong> te klikken om een lijst van "
-"beschikbare plugins te downloaden en te tonen."
+"Klik op <strong>Lijst downloaden</strong> om een lijst van beschikbare plug-"
+"ins te downloaden en weer te geven."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:114
@@ -16372,10 +16820,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113
 msgid "Ask before updating"
-msgstr "Vraag vooraleer bij te werken"
+msgstr "Vragen vóór bijwerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
 msgid "Always update without asking"
-msgstr ""
+msgstr "Altijd bijwerken zonder te vragen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
@@ -16389,6 +16837,6 @@
 "startup after an update of JOSM itself."
 msgstr ""
-"Gelieve aan te geven of JOSM, nadat het zelf bijgewerkt werd, bij het "
-"opstarten automatisch de aktieve plugins zal bijwerken."
+"Bepaal of JOSM, nadat het zelf bijgewerkt werd, bij het opstarten "
+"automatisch de actieve plug-ins moet bijwerken."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
@@ -16401,11 +16849,11 @@
 "certain periode of time."
 msgstr ""
-"Gelieve aan te geven of JOSM na een bepaalde tijdsperiode automatisch de "
-"aktieve plugins mag bijwerken"
+"Bepaal of JOSM na een bepaalde tijdsperiode automatisch de actieve plug-ins "
+"moet bijwerken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
 #, java-format
 msgid "Testing OSM API URL ''{0}''"
-msgstr ""
+msgstr "Testen van OSM API URL ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
@@ -16415,9 +16863,11 @@
 "validate again.</html>"
 msgstr ""
+"<html>''{0}'' is ngeen geldige OSM API URL.<br>Controleer de spelling en "
+"valideer opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
 msgid "Invalid API URL"
-msgstr ""
+msgstr "Ongeldige API URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
@@ -16427,4 +16877,6 @@
 "<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
+"<html>Bouwen van URL ''{0}'' voor valideren van de server van OSM API "
+"mislukt.<br>Controleer de spelling van ''{1}'' en valideer opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -16434,4 +16886,6 @@
 "''{1}'' and your Internet connection and validate again.</html>"
 msgstr ""
+"<html>Verbinden met de URL ''{0}'' mislukt.<br>Controleer de spelling van "
+"''{1}'' en uw internet-verbinding en valideer opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
@@ -16439,5 +16893,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
 msgid "Connection to API failed"
-msgstr ""
+msgstr "Verbinding met API mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
@@ -16448,4 +16902,8 @@
 "<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
+"<html>Verkrijgen van een lijst met wijzigingensets vanaf de server van OSM "
+"API op<br>''{1}'' mislukt. De server antwoordde met de retourcode {0} in "
+"plaats van 200.<br>Controleer de spelling van ''{1}'' en valideer opnieuw.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -16456,8 +16914,11 @@
 "spelling of ''{0}'' and validate again.</html>"
 msgstr ""
+"<html>De server van OSM API op ''{0}'' gaf geen geldig antwoord retour."
+"<br>Het is aannemelijk dat ''{0}'' geen server voor OSM API is."
+"<br>Controleer de spelling van ''{0}'' en valideer opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
 msgid "Use Basic Authentication"
-msgstr ""
+msgstr "Basis-authenticatie gebruiken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
@@ -16465,12 +16926,14 @@
 "Select to use HTTP basic authentication with your OSM username and password"
 msgstr ""
+"Selecteer dit om HTTP basis-authenticatie te gebruiken met uw gebruikersnaam "
+"en wachtwoord voor OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
 msgid "Use OAuth"
-msgstr ""
+msgstr "OAuth gebruiken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
 msgid "Select to use OAuth as authentication mechanism"
-msgstr ""
+msgstr "Selecteren om OAuth te gebruiken als mechanisme voor authenticatie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
@@ -16480,16 +16943,20 @@
 "authentication method ''Basic Authentication''."
 msgstr ""
+"Waarschuwing: Niet ondersteunde waarde in voorkeur ''{0}'', kreeg {1}''. "
+"Gebruik de authenticatie-methode ''Basis-authenticatie''."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
-msgstr ""
+msgstr "OSM gebruikersnaam:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
 msgid "OSM password:"
-msgstr ""
+msgstr "OSM wachtwoord"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:106
 msgid "Warning: failed to retrieve OSM credentials from credential manager."
 msgstr ""
+"Waarschuwing: verkrijgen van de beveiligde gegevens van OSM vanuit het "
+"beheer van die gegevens mislukt."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:107
@@ -16499,17 +16966,23 @@
 #, java-format
 msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+msgstr "Huidig beheer voor beveiligde gegevens is van het type ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:123
 msgid "Warning: failed to save OSM credentials to credential manager."
 msgstr ""
+"Waarschuwing: opslaan van de beveiligde gegevens voor OSM naar beheer van "
+"die gegevens is mislukt."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:146
 msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
+"Waarschuwing: verkrijgen van het Toegangstoken voor OAuth vanuit beheer "
+"beveiligde gegevens is mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:177
 msgid "Warning: Failed to store OAuth Access Token to credentials manager"
 msgstr ""
+"Waarschuwing: opslaan van Toegangstoken voor OAuth in beheer van beveiligde "
+"gegevens is mislukt"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:183
@@ -16518,20 +16991,24 @@
 "Please authorize first."
 msgstr ""
+"U heeft nog geen Toegangstoken om toegang te krijgen tot de server van OSM "
+"met behulp van OAuth. U moet eerst autoriseren."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:222
 msgid "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
+"U heeft al een Toegangstoken om toegang te krijgen tot de server van OSM met "
+"behulp van OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:254
 msgid "Save to preferences"
-msgstr ""
+msgstr "Opslaan naar voorkeuren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:303
 msgid "Click to step through the OAuth authorization process"
-msgstr ""
+msgstr "Klik om door het autorisatieproces van OAuth te gaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:327
 msgid "New Access Token"
-msgstr ""
+msgstr "Nieuw Toegangstoken"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:328
@@ -16540,8 +17017,11 @@
 "Access Token"
 msgstr ""
+"Klik om door het autorisatieproces van OAuth te gaan en een nieuw "
+"Toegangstoken te genereren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:353
 msgid "Click test access to the OSM server with the current access token"
 msgstr ""
+"Klik om toegang tot de server van OSM met het huidige Toegangstoken te testen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:63
@@ -16549,8 +17029,10 @@
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
+"<html>Gebruik de standaard URL voor de server van OSM (<strong>{0}</strong>)"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:89
 msgid "OSM Server URL:"
-msgstr ""
+msgstr "URL voor server van OSM:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164
@@ -16561,30 +17043,30 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:165
 msgid "Test the API URL"
-msgstr ""
+msgstr "Test de API URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:181
 msgid "The API URL is valid."
-msgstr ""
+msgstr "De API URL is geldig."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:186
 msgid "Validation failed. The API URL seems to be invalid."
-msgstr ""
+msgstr "Validatie mislukt. De API URL lijkt ongeldig te zijn."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:247
 msgid "OSM API URL must not be empty. Please enter the OSM API URL."
-msgstr ""
+msgstr "OSM API URL mag niet leeg zijn. Voer de OSM API URL in."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:251
 msgid "The current value is not a valid URL"
-msgstr ""
+msgstr "De huidige waarde is geen geldige URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:253
 msgid "Please enter the OSM API URL."
-msgstr ""
+msgstr "Voer de OSM API URL in."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:179
 msgid "Host:"
-msgstr ""
+msgstr "Host:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:114
@@ -16592,5 +17074,5 @@
 msgctxt "server"
 msgid "Port:"
-msgstr ""
+msgstr "Poort:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
@@ -16598,16 +17080,17 @@
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
+"Voer een gebruikersnaam en wachtwoord in als uw proxy authenticatie vereist."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
 msgid "Password:"
-msgstr ""
+msgstr "Wachtwoord:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
 msgid "No proxy"
-msgstr ""
+msgstr "Geen proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:242
 msgid "Use standard system settings"
-msgstr ""
+msgstr "Gebruik de standaard systeeminstellingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
@@ -16616,12 +17099,14 @@
 "useSystemProxies=true</tt> to enable)"
 msgstr ""
+"Gebruik de standaard systeeminstellingen (uitgeschakeld. Start JOSM op met "
+"<tt>-Djava.net.useSystemProxies=true</tt> om in te schakelen)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
 msgid "Manually configure a HTTP proxy"
-msgstr ""
+msgstr "Handmatig configureren van een HTTP proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:274
 msgid "Use a SOCKS proxy"
-msgstr ""
+msgstr "Gebruik een SOCKS proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:318
@@ -16630,4 +17115,7 @@
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"Waarschuwing: JOSM is geconfigureerd om proxies te gebruiken vanuit de "
+"systeeminstellingen, maar de JVM is niet geconfigureerd om die te "
+"verkrijgen. herstellen van voorkeuren naar ''Geen proxy''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:54
@@ -16640,16 +17128,16 @@
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Verwijder oude sleutels van tot {0} objekt"
-msgstr[1] "Verwijder oude sleutels van tot {0} objekten"
+msgstr[0] "Verwijder oude sleutels van maximaal {0} object"
+msgstr[1] "Verwijder oude sleutels van maximaal {0} objecten"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:179
 msgid "Delete the selection in the tag table"
-msgstr ""
+msgstr "Verwijder de selectie in de tabel met tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:271
 msgid "Add a new tag"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
+msgstr "Voeg een nieuw tag toe"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479
 #, java-format
 msgid ""
@@ -16657,6 +17145,8 @@
 "must be the same as in ''values''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481
+"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
+"''display_values'' moet hetzelfde zijn als in ''values''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:484
 #, java-format
 msgid ""
@@ -16664,4 +17154,6 @@
 "''short_descriptions'' must be the same as in ''values''"
 msgstr ""
+"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
+"''short_descriptions'' moet hetzelfde zijn als in ''values''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
@@ -16673,21 +17165,21 @@
 #, java-format
 msgid "Unknown requisite: {0}"
-msgstr ""
+msgstr "Onbekend vereiste: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:943
 msgid "Available roles"
-msgstr ""
+msgstr "Beschikbare rollen"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:944
 msgid "role"
-msgstr ""
+msgstr "rol"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:945
 msgid "count"
-msgstr ""
+msgstr "aantal"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "elements"
-msgstr ""
+msgstr "elementen"
 
 #. space
@@ -16696,28 +17188,28 @@
 msgstr "Optionele attributen:"
 
-#: ../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 "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
 
-#: ../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 "Voorkeuze ''{0}'' gebruiken"
 
-#: ../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 "Onbekend type: {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
+msgstr "Voorkeuze rol element zonder ouder"
+
+#: ../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
+msgstr "Voorkeuze sub-element zonder ouder"
+
+#: ../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
@@ -16725,42 +17217,42 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1208
+msgstr "Kan vooraf ingestelde bron voor taggen niet lezen: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1229
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {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 "Elementen van type {0} worden ondersteund."
 
-#: ../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
 msgid "Change {0} object"
 msgid_plural "Change {0} objects"
-msgstr[0] "{0} object wijzigen"
-msgstr[1] "{0} objecten wijzigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
+msgstr[0] "Wijzig {0} object"
+msgstr[1] "Wijzig {0} objecten"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../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 "Voorinstelling toepassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+msgstr "Voorkeuze toepassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363
 msgid "New relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1434
+msgstr "Nieuwe relatie"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1455
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16770,46 +17262,46 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr ""
+msgstr "Voorkeuze groep {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr ""
+msgstr "Voorkeuze groep {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Search preset"
-msgstr ""
+msgstr "Voorkeuze zoeken"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Dialoogvenster Voorkeuze zoeken weergeven"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
 msgid "Search presets"
-msgstr ""
+msgstr "Voorkeuzen zoeken"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Show only applicable to selection"
-msgstr ""
+msgstr "Alleen die geselecteerd kunnen worden weergeven"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:319
 msgid "Search in tags"
-msgstr ""
+msgstr "In tags zoeken"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:68
 msgid "Min. latitude"
-msgstr ""
+msgstr "Min. breedtegraad"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:70
 msgid "Min. longitude"
-msgstr ""
+msgstr "Min. lengtegraad"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:72
 msgid "Max. latitude"
-msgstr ""
+msgstr "Max. breedtegraad"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:74
 msgid "Max. longitude"
-msgstr ""
+msgstr "Max. lengtegraad"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:84
@@ -16818,4 +17310,6 @@
 "a bounding box)"
 msgstr ""
+"URL vanaf www.openstreetmap.org (u kunt hier een URL om vanaf te downloaden "
+"plakken om een begrensd gebied te specificeren)"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:74
@@ -16823,8 +17317,49 @@
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
 msgstr ""
+"De huidige waarde is geen geldige ID voor OSM. Voer een geheel getal > 0 in"
+
+#: ../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 ""
+"Weg met externe ID ''{0}'' bevat ontbrekende knoop met externe ID ''{1}''."
+
+#: ../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 "Verwijderde knoop {0} is deel van weg {1}"
+
+#: ../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 ""
+"Weg {0} met {1} knopen heeft incomplete knopen omdat ten minste één knoop "
+"ontbreekt in de geladen gegevens."
+
+#: ../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 ""
+"Relatie met externe ID ''{0}'' verwijst naar een ontbrekende primitief met "
+"externe ID ''{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 "Verwijderd lid {0} wordt gebruikt door relatie {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
 msgid "All Formats"
-msgstr "Alle formaten"
+msgstr "Alle indelingen"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
@@ -16834,10 +17369,10 @@
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
-msgstr "Met OSM-server verbinden..."
+msgstr "Verbinden met server van OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
 #, java-format
 msgid "Downloading points {0} to {1}..."
-msgstr "Downloaden van punten {0} tot {1}..."
+msgstr "Downloaden van punten {0} tot en met {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:122
@@ -16848,4 +17383,6 @@
 "capabilities. Got ''{2}''"
 msgstr ""
+"Waarschuwing: ongeldige waarde van attribuut ''{0}'' van element ''{1}'' in "
+"mogelijkheden voor de server. Kreeg ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -16853,5 +17390,5 @@
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
-msgstr ""
+msgstr "Ontleden van datum ''{0}'', antwoord van server, mislukt."
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
@@ -16861,4 +17398,6 @@
 "''{0}''"
 msgstr ""
+"Onverwachte indeling van kop voor fout voor conflict in bijwerken van "
+"wijzigingenset. Kreeg ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
@@ -16867,10 +17406,10 @@
 #, java-format
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Ongeldige waarde voor lengtegraad voor parameter ''{0}'', kreeg {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
 #, java-format
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Ongeldige waarde voor breedtegraad voor parameter ''{0}'', kreeg {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
@@ -16887,4 +17426,6 @@
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
+"Onverwachte waarde voor ''{0}'' in url voor aanvraag van wijzigingenset, "
+"kreeg {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -16894,4 +17435,6 @@
 "and ''display_name''"
 msgstr ""
+"Kan geen query voor een wijzigingenset maken die zowel de parameters voor de "
+"query ''uid'' en ''display_name'' bevat"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
@@ -16899,4 +17442,6 @@
 msgid "Unsupported parameter ''{0}'' in changeset query string"
 msgstr ""
+"Niet ondersteunde parameter ''{0}'' in tekenreeks voor query voor "
+"wijzigingenset"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:81
@@ -16905,4 +17450,5 @@
 "Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
 msgstr ""
+"Onverwachte indeling voor poortnummer in voorkeur ''{0}''. Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:82
@@ -16911,10 +17457,10 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
 msgid "The proxy will not be used."
-msgstr ""
+msgstr "De proxy zal niet worden gebruikt."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
 #, java-format
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
+msgstr "Ongeldig poortnummer in voorkeur ''{0}''. Kreeg {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
@@ -16924,4 +17470,6 @@
 "use no proxy."
 msgstr ""
+"Waarschuwing: onverwachte waarde voor voorkeur ''{0}'' gevonden. Kreeg "
+"''{1}''. Zal geen proxy gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:115
@@ -16931,4 +17479,6 @@
 "''{1}''."
 msgstr ""
+"Waarschuwing: Onverwachte parameters voor HTTP proxy. Kreeg host ''{0}'' en "
+"poort ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:127
@@ -16938,4 +17488,6 @@
 "''{1}''."
 msgstr ""
+"Waarschuwing: Onverwachte parameters voor SOCKS proxy. Kreeg host ''{0}'' en "
+"poort ''{1}''."
 
 #. Just log something. The network stack will also throw an exception which will be caught
@@ -16947,4 +17499,6 @@
 "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
 msgstr ""
+"Fout: Verbinding naar proxy ''{0}'' voor URI ''{1}'' mislukt. Uitzondering "
+"was: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
@@ -16954,37 +17508,40 @@
 "time.  Will not use a proxy."
 msgstr ""
+"Waarschuwing: de JVM is niet geconfigureerd om proxies op te zoeken vanuit "
+"de systeeminstellingen. De eigenschap ''java.net.useSystemProxies'' ontbrak "
+"op het moment van opstarten.  Zal geen proxy gebruiken."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
 msgid "Parsing response from server..."
-msgstr ""
+msgstr "Antwoord van server ontleden..."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Onverwacht XML-element met de naam ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
 #, java-format
 msgid "Could not export ''{0}''."
-msgstr ""
+msgstr "Kon ''{0}'' niet exporteren."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
 #, java-format
 msgid "Could not import ''{0}''."
-msgstr ""
+msgstr "Kon ''{0}'' niet importeren."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:47
 msgid "Could not import files."
-msgstr ""
+msgstr "Kon geen bestanden importeren."
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr ""
+msgstr "<html>Kon bestand ''{0}'' niet lezen.<br>Fout is:<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:79
 #, java-format
 msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
-msgstr ""
+msgstr "<html>Kon bestanden niet lezen.<br>Fout is:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42
@@ -16993,6 +17550,6 @@
 "tracks."
 msgstr ""
-"Let op: GPL is niet verenigbaar met de OSM licentie. Upload geen bestanden "
-"met een GPL-licentie."
+"Opmerking: GPL is niet compatibel met de licentie van OSM. Geen sporen "
+"uploaden met licentie GPL."
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:45
@@ -17003,9 +17560,9 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
 msgid "GPS track description"
-msgstr "GPS-trackomschrijving"
+msgstr "beschrijving GPS-spoor"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
 msgid "Add author information"
-msgstr "Voeg auteursinformatie toe"
+msgstr "Voeg informatie over auteur toe"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
@@ -17023,5 +17580,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94
 msgid "Predefined"
-msgstr "Voorgedefinieerd"
+msgstr "Vooraf gedefinieerd"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:96
@@ -17035,5 +17592,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:117
 msgid "Export options"
-msgstr "Exporteeropties"
+msgstr "Opties voor exporteren"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
@@ -17053,5 +17610,5 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:261
 msgid "Choose a predefined license"
-msgstr "Kies een voorgedefineerde licentie"
+msgstr "Kies een vooraf gedefinieerde licentie"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
@@ -17064,5 +17621,5 @@
 #, java-format
 msgid "Markers from {0}"
-msgstr "Markers van {0}"
+msgstr "Markeringen van {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
@@ -17074,4 +17631,6 @@
 "available."
 msgstr ""
+"Er trad een fout op tijdens het ontleden van GPX-bestand {0}. Slechts een "
+"gedeelte van het bestand zal beschikbaar zijn."
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
@@ -17080,5 +17639,5 @@
 #, java-format
 msgid "File \"{0}\" does not exist"
-msgstr ""
+msgstr "Bestand \"{0}\" bestaat niet"
 
 #. input was not properly parsed, abort
@@ -17088,35 +17647,35 @@
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Ontleden van bestand \"{0}\" mislukt"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
-msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
+msgstr "Fout bij ontleden: documentstructuur voor GPX-document is ongeldig"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
-msgstr ""
+msgstr "Onbekende modus {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "Image Files"
-msgstr ""
+msgstr "Afbeeldingsbestanden"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "folder"
-msgstr ""
+msgstr "map"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
 msgid "Looking for image files"
-msgstr ""
+msgstr "Zoeken naar afbeeldingsbestanden"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
-msgstr ""
+msgstr "Geen afbeeldingsbestanden gevonden."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:84
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "Openenen van invoerstroom voor bron ''{0}'' mislukt"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:130
@@ -17126,9 +17685,11 @@
 "zip file ''{0}''. Exception was: {1}"
 msgstr ""
+"Waarschuwing: openen van bestand met de extensie ''{2}'' en deel van naam "
+"''{3}'' in zip-bestand ''{0}'' mislukt. Uitzondering was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:242
 #, java-format
 msgid "Failed to rename file {0} to {1}."
-msgstr ""
+msgstr "Hernoemen van bestand {0} naar {1} mislukt."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:247
@@ -17136,4 +17697,6 @@
 msgid "Failed to load {0}, use cached file and retry next time: {1}"
 msgstr ""
+"Laden van {0} mislukt, gebruik het bestand in de cache en probeer de "
+"volgende keer: {1}"
 
 #. I18n: argument is HTTP response code
@@ -17144,18 +17707,20 @@
 "header. Can''t redirect. Aborting."
 msgstr ""
+"Onverwacht antwoord van de HTTP-server. Kreeg {0} antwoord zonder kop "
+"''Location''. Kan niet doorgeleiden. Afbreken."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:307
 msgid "Too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgstr "Teveel doorgeleidingen naar de download-URL gedetecteerd. Afbreken."
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:310
 #, java-format
 msgid "Download redirected to ''{0}''"
-msgstr ""
+msgstr "Downloaden doorgeleid naar ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:313
 #, java-format
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
-msgstr ""
+msgstr "Lezen vanaf ''{0}'' mislukt. Server antwoordde met statuscode {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:113
@@ -17163,4 +17728,6 @@
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
+"Geen primitief met ID {0} in lokale gegevensset. Kan type primitief niet "
+"bepalen."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:300
@@ -17171,40 +17738,40 @@
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:95
 msgid "Downloading OSM data..."
-msgstr "OSM-gegevens downloaden"
+msgstr "Downloaden van gegevens van OSM"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:352
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Knoop met ID {0} ophalen vanaf ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:353
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
-msgstr ""
+msgstr "Weg met ID {0} ophalen vanaf ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:354
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr ""
+msgstr "Relatie met ID {0} ophalen vanaf ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "Server antwoordde met retourcode 404 voor ID {0}. Overslaan."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:402
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Een pakket knopen ophalen vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
-msgstr ""
+msgstr "Een pakket wegen ophalen vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr ""
+msgstr "Een pakket relaties ophalen vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
@@ -17213,4 +17780,6 @@
 "for each object."
 msgstr ""
+"Server antwoordde met retourcode 404, opnieuw proberen met een individueel "
+"verzoek voor elk object."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:442
@@ -17218,6 +17787,6 @@
 msgid "Downloading {0} object from ''{1}''"
 msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Downloaden van {0} object vanaf ''{1}''"
+msgstr[1] "Downloaden van {0} objecten vanaf ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:24
@@ -17228,42 +17797,43 @@
 #, java-format
 msgid "Coordinates imported: {0}"
-msgstr ""
+msgstr "Geïmporteerde coördinaten: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:59
 #, java-format
 msgid "Malformed sentences: {0}"
-msgstr ""
+msgstr "Misvormde zinnen: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:60
 #, java-format
 msgid "Checksum errors: {0}"
-msgstr ""
+msgstr "Fouten in controlesom: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:62
 #, java-format
 msgid "Unknown sentences: {0}"
-msgstr ""
+msgstr "Onbekende zinnen: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:64
 #, java-format
 msgid "Zero coordinates: {0}"
-msgstr ""
+msgstr "Nul-coördinaten: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:70
 msgid "NMEA import success"
-msgstr "NMEA-import gelukt"
+msgstr "Importeren van NMEA gelukt"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:76
 msgid "NMEA import failure!"
-msgstr "Importeren NMEA is mislukt!"
+msgstr "Importeren van NMEA mislukt!"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:85
 #, java-format
 msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
-msgstr ""
+msgstr "Voorkeur ''{0}'' ontbreekt. Kan OsmApi niet initialiseren."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:169
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
+"Deze versie van JOSM is niet incompatibel met de geconfigureerde server."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
@@ -17273,9 +17843,11 @@
 "{1}."
 msgstr ""
+"Het ondersteunt protocolversie 0.6, terwijl de server zegt dat het {0} tot "
+"en met {1} ondersteunt."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
-msgstr ""
+msgstr "Communicatie met {0} gemaakt met behulp van protocolversie {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:200
@@ -17283,4 +17855,5 @@
 msgid "Removed layer {0} because it is not allowed by the configured API."
 msgstr ""
+"Laag {0} verwijderd omdat die niet is toegestaan door de geconfigureerde API."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:288
@@ -17288,5 +17861,5 @@
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr ""
+msgstr "Onverwachte indeling van ID geantwoord door de server. Kreeg ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
@@ -17295,13 +17868,15 @@
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
+"Onverwachte indeling van nieuwe versie van aangepaste primitief ''{0}''. "
+"Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
 msgid "Creating changeset..."
-msgstr ""
+msgstr "Wijzigingenset maken..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
+msgstr "Wijzigingenset {0} met succes geopend"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378
@@ -17310,53 +17885,53 @@
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
-msgstr ""
+msgstr "ID van wijzigingenset > 0 werd verwacht Kreeg {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 msgid "Updating changeset..."
-msgstr ""
+msgstr "Wijzigingenset bijwerken..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
+msgstr "Wijzigingenset bijwerken {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420
 msgid "Closing changeset..."
-msgstr "Wijzigingenset sluiten"
+msgstr "Wijzigingenset sluiten..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:443
 msgid "No changeset present for diff upload."
-msgstr ""
+msgstr "Geen wijzigingenset aanwezig voor uploaden van diff."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
 msgid "Preparing upload request..."
-msgstr ""
+msgstr "Voorbereiden verzoek voor uploaden..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:480
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Wachten voor 10 seconden ... "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr ""
+msgstr "Opnieuw starten {0} van {1} na {2} seconden ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:491
 msgid "OK - trying again."
-msgstr ""
+msgstr "OK - opnieuw proberen."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:577
 #, java-format
 msgid "Starting retry {0} of {1}."
-msgstr ""
+msgstr "Opnieuw starten {0} van {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:673
 msgid "Current changeset is null. Cannot upload data."
-msgstr ""
+msgstr "Huidige wijzigingenset is null. Kan geen gegevens uploaden."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:675
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
-msgstr ""
+msgstr "ID van huidige wijzigingenset > 0 vereist. Huidige ID is {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:703
@@ -17364,4 +17939,5 @@
 msgid "Open changeset expected. Got closed changeset with id {0}."
 msgstr ""
+"Geopende wijzigingenset verwacht. Kreeg gesloten wijzigingenset met ID {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:99
@@ -17369,24 +17945,25 @@
 #, java-format
 msgid "(Code={0})"
-msgstr ""
+msgstr "(Code={0})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:105
 #, java-format
 msgid "The server replied an error with code {0}."
-msgstr ""
+msgstr "De server antwoordde met een fout met code {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "OSM Server-bestanden bzip2 gecomprimeerd"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
 msgid "Invalid bz2 file."
-msgstr ""
+msgstr "Ongeldig bz2-bestand."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
 msgid "Prolog of OsmChange document already written. Please write only once."
 msgstr ""
+"Proloog van document van OsmChange al geschreven. Slechts één maal schrijven."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
@@ -17395,4 +17972,5 @@
 msgid "Prolog of OsmChange document not written yet. Please write first."
 msgstr ""
+"Proloog van document van OsmChange nog niet geschreven. Dat eerst schrijven."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
@@ -17407,5 +17985,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
@@ -17417,5 +17995,5 @@
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
+msgstr "Ontbrekend verplicht attribuut ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:79
@@ -17429,4 +18007,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type long. Kreeg "
+"''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:82
@@ -17441,4 +18021,6 @@
 "''{1}''."
 msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type long (>=0). "
+"Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112
@@ -17449,4 +18031,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
 msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type double. Kreeg "
+"''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
@@ -17457,4 +18041,6 @@
 "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type boolean. "
+"Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
@@ -17462,5 +18048,5 @@
 #: ../plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java:151
 msgid "<anonymous>"
-msgstr ""
+msgstr "<anoniem>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:202
@@ -17472,4 +18058,6 @@
 "''{1}''."
 msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type "
+"OsmPrimitiveType. Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
@@ -17480,4 +18068,6 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Waarschuwing: niet ondersteund startelement ''{0}'' in inhoud van "
+"wijzigingenset op positie ({1},{2}). Overslaan."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -17487,4 +18077,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Ongeldige documentstructuur. Knoop, weg of relatie gevonden buiten "
+"''maken'', ''aanpassen'', of ''verwijderen''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -17495,9 +18087,11 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Waarschuwing: niet ondersteund eindelement ''{0}'' in inhoud wijzigingenset "
+"op positie ({1},{2}). Overslaan."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
 #: ../plugins/reverter/src/reverter/corehacks/OsmChangesetContentParser.java:308
 msgid "Parsing changeset content ..."
-msgstr ""
+msgstr "Ontleden van inhoud wijzigingenset ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:77
@@ -17508,18 +18102,17 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Ongeldige waarde voor attribuut ''{0}''. Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:80
 #, java-format
 msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Ongeldige numerieke waarde voor attribuut ''{0}''. Kreeg ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:114
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Ongeldige Booleaanse waarde voor attribuut ''{0}''. Kreeg ''{1}''."
 
 #: ../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
@@ -17527,38 +18120,41 @@
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
-msgstr ""
+msgstr "Ontbrekend verplicht attribuut ''{0}'' van XML-element {1}."
 
 #: ../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
 #, java-format
 msgid "Unsupported version: {0}"
-msgstr ""
+msgstr "Niet ondersteunde versie: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:175
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
+msgstr "Niet gedefinieerd element ''{0}'' gevonden in invoerstroom. Afbreken."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
 msgid "Parsing list of changesets..."
-msgstr ""
+msgstr "Ontleden van lijst van wijzigingensets..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:122
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
+"Ondertekenen van een HTTP-verbinding met een kop van OAuth Authentication "
+"mislukt"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:133
 #, java-format
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Waarschuwing: onverwachte waarde voor voorkeur ''{0}''. Kreeg ''{1}''."
 
 #: ../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
 #, java-format
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(op regel {0}, kolom {1})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -17570,5 +18166,5 @@
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
-msgstr ""
+msgstr "<html>Er trad een fout op bij het opslaan.<br>Fout is:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104
@@ -17578,18 +18174,20 @@
 "html>"
 msgstr ""
+"<html>Er trad een fout op bij het terugzetten van het back-upbestand."
+"<br>Fout is:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
+msgstr "Kon geen back-up maken van het bestand. Uitzondering is: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
-msgstr ""
+msgstr "OSM Server-bestanden gzip gecomprimeerd"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
-msgstr ""
+msgstr "Ontleden van gegevens over historie van OSM ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
@@ -17597,16 +18195,16 @@
 #, java-format
 msgid "File ''{0}'' does not exist."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53
+msgstr "Bestand \"{0}\" bestaat niet."
+
+#: ../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
+msgstr "Geen gegevens gevonden in bestand {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:58
 msgid "Open OSM file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160
+msgstr "Open OSM-bestand"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:170
 #, java-format
@@ -17615,18 +18213,21 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 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
+"Ontbrekende verplichte attributen voor element ''bounds''. Kreeg "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+
+#: ../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 "Verwijderde weg {0} bevat knopen"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
+msgstr "Ontbrekend verplicht attribuut ''{0}'' op <nd> van weg {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:153
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:188
@@ -17634,37 +18235,33 @@
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
-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
+msgstr "Ongeldige waarde van attribuut ''ref'' van element <nd>. Kreeg {0}."
+
+#: ../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 "Verwijderde relatie {0} bevat leden"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
+msgstr "Ontbrekend attribuut ''ref'' op lid in relatie {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:248
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
+"Ongeldige waarde voor attribuut ''ref'' op lid in relatie {0}. Kreeg {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:193
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:252
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:247
+msgstr "Ontbrekend attribuut ''type'' op lid {0} in relatie {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:199
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:257
@@ -17673,36 +18270,32 @@
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
+"Ongeldige waarde voor attribuut ''type'' op lid {0} in relatie {1}. Kreeg "
+"{2}."
+
+#: ../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 "Incomplete <member>-specificatie met 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
+msgstr "Incomplete specificatie voor <member> met ref=0"
+
+#: ../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
+msgstr "Ontbrekende sleutel of waarde van attribuut in tag."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305
+msgstr "Niet gedefinieerd element ''{0}'' gevonden in invoerstroom. Overslaan."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308
 msgid "Illegal object with ID=0."
-msgstr "Ongeldig object met id=0"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335
+msgstr "Ongeldig object met ID=0"
+
+#: ../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
@@ -17713,10 +18306,12 @@
 "{1}."
 msgstr ""
+"Ongeldige waarde voor attribuut ''version'' op primitief van OSM met ID {0}. "
+"Kreeg {1}."
 
 #. 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
@@ -17728,21 +18323,23 @@
 "API version is ''{3}''. Got {1}."
 msgstr ""
+"WAARSCHUWING: Normaliseren van waarde van attribuut ''version'' van element "
+"{0} naar {2}, versie van API is ''{3}''. Kreeg {1}."
 
 #. 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
 msgid "Unknown or unsupported API version. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
+msgstr "Onbekende of niet ondersteunde versie van de API. Kreeg {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:419
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr ""
+msgstr "Ontbrekend attribuut ''version'' op primitief van OSM met ID {0}."
 
 #. 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
@@ -17754,8 +18351,10 @@
 "Resetting to 0."
 msgstr ""
+"Ongeldige waarde voor attribuut ''changeset'' op nieuw object {1}. Kreeg "
+"{0}. Herstellen naar 0."
 
 #. 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
@@ -17764,95 +18363,62 @@
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411
+msgstr "Ongeldige waarde voor attribuut ''changeset''. Kreeg {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:474
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414
 #, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416
+msgstr "Ontbrekend vereist attribuut ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310
 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
-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
+msgstr "Ongeldige long-waarde voor attribuut ''{0}''. Kreeg ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:541
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:250
 msgid "Prepare OSM data..."
-msgstr "OSM-gegevens voorbereiden..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
+msgstr "Gegevens van OSM voorbereiden..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:542
 msgid "Parsing OSM data..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
+msgstr "Gegevens van OSM ontleden..."
+
+#: ../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
+msgstr "gegevensset voorbereiden..."
+
+#: ../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
 #, java-format
 msgid "Line {0} column {1}: "
-msgstr ""
+msgstr "Regel {0} kolom {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Downloaden vanaf server van OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Downloaden van verwijzende wegen ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
 msgid "Downloading referring relations ..."
-msgstr ""
+msgstr "Downloaden van verwijzende relaties ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 #: ../plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java:65
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Wijzigingensets lezen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
 #: ../plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java:71
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Downloaden van wijzigingensets ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
@@ -17860,5 +18426,5 @@
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Wijzigingenset {0} lezen ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
@@ -17866,5 +18432,5 @@
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "Wijzigingenset {0} downloaden ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
@@ -17873,6 +18439,6 @@
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Wijzigingenset {0} downloaden ..."
+msgstr[1] "Downloaden van {0} wijzigingensets ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
@@ -17880,5 +18446,5 @@
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr ""
+msgstr "({0}/{1}) Wijzigingenset {2} downloaden ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
@@ -17886,9 +18452,9 @@
 #, java-format
 msgid "Downloading content for changeset {0} ..."
-msgstr ""
+msgstr "Inhoud voor wijzigingenset {0} downloaden ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
-msgstr ""
+msgstr "Historie downloaden..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
@@ -17899,5 +18465,5 @@
 #, java-format
 msgid "Failed to open connection to API {0}."
-msgstr ""
+msgstr "Openen van verbinding met {0} mislukt."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:85
@@ -17905,13 +18471,14 @@
 "Could not connect to the OSM server. Please check your internet connection."
 msgstr ""
-"Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
+"Kon geen verbinding maken met de server van OSM. Controleer uw verbinding "
+"met internet."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:111
 msgid "Reading error text failed."
-msgstr ""
+msgstr "Lezen van de tekst van de fout mislukt."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
-msgstr ""
+msgstr "XML-tag <user> ontbreekt."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
@@ -17921,5 +18488,5 @@
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
-msgstr ""
+msgstr "Ontbrekend attribuut ''{0}'' op XML-tag ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
@@ -17929,41 +18496,41 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
-msgstr ""
+msgstr "Ongeldige waarde voor attribuut ''{0}'' op XML-tag ''{1}''. Kreeg {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
 msgid "Reading user info ..."
-msgstr ""
+msgstr "Informatie over gebruiker lezen ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:76
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
+msgstr "Starten met uploaden van één verzoek per primitief ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:84
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} links. Uploaden van knoop ''{4}'' (ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:85
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} links. Uploaden van weg ''{4}'' (ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} links. Uploaden van relatie ''{4}'' (ID: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "Starten met uploaden in één verzoek ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Waarde >0 verwacht voor parameter ''{0}'', kreeg {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:140
 msgid "Starting to upload in chunks..."
-msgstr ""
+msgstr "Starten met uploaden in gedeelten..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:156
@@ -17971,19 +18538,48 @@
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0}/{1}) Uploaden van {2} object..."
+msgstr[1] "({0}/{1}) Uploaden van {2} objecten..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Uploaden van gegevens ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:223
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "Onverwachte ID voor primitief van OSM gevonden"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21
+#, fuzzy
+msgid "OSM Server Files PBF compressed"
+msgstr "OSM Server-bestanden gzip gecomprimeerd"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57
+#, fuzzy, java-format
+msgid "Invalid coordinates: {0}"
+msgstr "Nul-coördinaten: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63
+#, fuzzy, java-format
+msgid "Invalid changeset id: {0}"
+msgstr "Wijzigingenset aan het sluiten {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69
+#, fuzzy, java-format
+msgid "Invalid timestamp: {0}"
+msgstr "Ongeldige URL {0}"
+
+#: ../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 "Gegevens van OSM ontleden..."
 
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11
 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "WMS-bestanden (*.wms)"
 
 #: ../core/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java:117
@@ -17994,74 +18590,44 @@
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Waarschuwing:</strong> Het "
+"wachtwoord wordt in heldere tekst opgeslagen in het bestand van de "
+"voorkeuren voor JOSM. verder wordt het <strong>niet versleuteld</strong> "
+"overgedragen in elk verzoek dat wordt verzonden aan de server van OSM. "
+"<strong>Gebruik geen waardevol wachtwoord.</strong></p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java:131
 msgid "Save user and password (unencrypted)"
-msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
-
-#: ../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 ""
+msgstr "Gebruikersnaam en wachtwoord opslaan (niet versleuteld)"
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29
 #, java-format
 msgid "Querying offset availability: {0}"
-msgstr ""
+msgstr "Bevragen van beschikbaarheid voor verschuiving: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:32
 #, java-format
 msgid "Offset server response: {0}"
-msgstr ""
+msgstr "Antwoord van server voor verschuiving: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:45
 #, 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 ""
-"De projectie \"{0}\" in de URL en de huidige projectie \"{1}\" komen niet "
-"overeen.\n"
-"Dat kan tot foutieve coördinaten leiden."
+msgstr "Bevragen van verschuiving: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
 msgid "Add tags to selected objects"
-msgstr ""
+msgstr "Voeg tags toe aan geselecteerde objecten"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
 msgid "Add tags"
-msgstr ""
+msgstr "Tags toevoegen"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
 msgid "Assume"
-msgstr ""
+msgstr "Veronderstelling"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java:36
 msgid "Remote Control has been asked to create a new node."
-msgstr ""
+msgstr "Afstandsbediening is gevraagd om een nieuwe knoop te maken."
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java:23
@@ -18070,8 +18636,10 @@
 "URL:"
 msgstr ""
+"Afstandsbediening is gevraagd om een afbeeldingslaag te laden vanaf de "
+"volgende URL:"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java:48
 msgid "Remote imagery"
-msgstr ""
+msgstr "Afbeeldingen op afstand"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java:41
@@ -18087,5 +18655,5 @@
 #, java-format
 msgid "Request details: {0}"
-msgstr "Gewenste details: {0}"
+msgstr "Details van verzoek: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:128
@@ -18095,5 +18663,5 @@
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:129
 msgid "Confirm Remote Control action"
-msgstr "Remote-controlopdracht bevestigen"
+msgstr "Bevestig actie van Afstandsbediening"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java:30
@@ -18102,21 +18670,23 @@
 "web sites to detect a running JOSM."
 msgstr ""
+"Afstandsbediening is gevraagd zijn protocolversie te rapporteren. Dit maakt "
+"het voor websites mogelijk om een werkende JOSM te detecteren."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:99
 msgid "Skip download"
-msgstr "Download overslagen"
+msgstr "Downloaden overslaan"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:101
 msgid "Download Plugin"
-msgstr "Plugin downloaden"
+msgstr "Plug-in downloaden"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
 msgid "Skip Download"
-msgstr "Download overslagen"
+msgstr "Downloaden overslaan"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
-msgstr "JOSM versie {0} vereist voor plugin {1}."
+msgstr "JOSM-versie {0} vereist voor plug-in {1}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:109
@@ -18130,6 +18700,6 @@
 "Skipping download."
 msgstr ""
-"Waarschuwing: Kan plugin ''{0}'' niet downloaden. Zijn download link is niet "
-"geweten. Download wordt overgeslagen."
+"Waarschuwing: Kan plug-in ''{0}'' niet downloaden. De koppeling om vanaf te "
+"downloaden is onbekend. Downloaden wordt overgeslagen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:136
@@ -18139,16 +18709,16 @@
 "valid URL. Skipping download."
 msgstr ""
-"Waarschuwing: Kan plugin ''{0}'' niet downloaden. Zijn download link ''{1}'' "
-"is geen geldige URL. Download wordt overgeslagen."
+"Waarschuwing: Kan plug-in ''{0}'' niet downloaden. De koppeling om vanaf te "
+"downloaden ''{1}'' is geen geldige URL. Downloaden wordt overgeslagen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:156
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
-msgstr "Onmogelijk om de map ''{0}'' voor de plugin aan te maken"
+msgstr "Maken van de plug-in map ''{0}'' mislukt"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:164
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr "Downloadien van Plugin {0}..."
+msgstr "Downloaden van plug-in {0}..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -18156,9 +18726,9 @@
 #, java-format
 msgid "An error occurred in plugin {0}"
-msgstr "Een fout opgetreden in plugin {0}"
+msgstr "Er trad een fout op in plug-in {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
 msgid "integrated into main program"
-msgstr ""
+msgstr "geïntegreerd in hoofdprogramma"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92
@@ -18167,5 +18737,5 @@
 #, java-format
 msgid "replaced by new {0} plugin"
-msgstr ""
+msgstr "vervangen door nieuwe {0} plug-in"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:196
@@ -18173,6 +18743,7 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] "De volgende plugin is niet langer nodig en wordt gedeaktiveerd:"
-msgstr[1] "De volgende plugins zijn niet langer nodig en worden gedeaktiveerd:"
+msgstr[0] "De volgende plug-in is niet langer nodig en wordt uitgeschakeld:"
+msgstr[1] ""
+"De volgende plug-ins zijn niet langer nodig en worden uitgeschakeld:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
@@ -18183,7 +18754,7 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>Het laden van plugin \"{0}\" was voorzien.<br>Deze plugin wordt net "
+"<html>Het laden van plug-in \"{0}\" werd verzocht.<br>Deze plug-in wordt net "
 "langer ontwikkeld en zal waarschijnlijk fouten veroorzaken.<br>Hij zou "
-"moeten uitgeschaked worden.<br>Hem uit de instellingen wissen?</html>"
+"moeten worden uitgeschakeld.<br>Verwijderen uit de instellingen?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259
@@ -18192,23 +18763,24 @@
 "updated as well.<br><br>Update plugins now?"
 msgstr ""
-"Je hebt de JOSM software bijgewerkt <br> Om problemen te voorkomen zouden de "
-"plugins ook moeten worden bijgewerkt.<br><br>De plugins nu bijwerken?"
+"U hebt de software voor JOSM bijgewerkt <br> Om problemen te voorkomen "
+"zouden de plug-ins ook moeten worden bijgewerkt.<br><br>De plug-ins nu "
+"bijwerken?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:275
 #, java-format
 msgid "Last plugin update more than {0} days ago."
-msgstr "Laatste plugin-update is meer dan {0} dagen geleden."
+msgstr "Laatste bijwerking van plug-ins is meer dan {0} dagen geleden."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 msgid "Click to update the activated plugins"
-msgstr "Klik om de aktieve plugins bij te werken"
+msgstr "Klik om de actieve plug-ins bij te werken"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "Skip update"
-msgstr "Bijwerking overslagen."
+msgstr "Bijwerken overslaan."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 msgid "Click to skip updating the activated plugins"
-msgstr "Klik om de bijwerking van de aktieve plugins over te slagen."
+msgstr "Klik om het bijwerken van de actieve plug-ins over te slaan."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307
@@ -18217,6 +18789,6 @@
 "disabled."
 msgstr ""
-"Geen bijwerking voor de plugins na de bijwerking van JOSM. Het automatisch "
-"bijwerken bij het opstarten is uitgeschakeld."
+"Bijwerken van plug-ins na upgrade van JOSM overslaan. Automatisch bijwerken "
+"bij opstarten is ingeschakeld."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
@@ -18225,6 +18797,6 @@
 "startup is disabled."
 msgstr ""
-"Geen bijwerking voor de plugins na een tijdsperiode. Het automatisch "
-"bijwerken bij het opstarten is uitgeschakeld."
+"Bijwerken van plug-ins na verloop van tijdinterval overslaan. Automatisch "
+"bijwerken bij opstarten is ingeschakeld."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:316
@@ -18233,6 +18805,6 @@
 "enabled."
 msgstr ""
-"Bijwerking voor de plugins na de bijwerking van JOSM. Het automatisch "
-"bijwerken bij het opstarten is ingeschakeld."
+"Bijwerken van plug-ins na upgrade van JOSM uitvoeren. Automatisch bijwerken "
+"bij opstarten is ingeschakeld."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
@@ -18241,6 +18813,6 @@
 "startup is disabled."
 msgstr ""
-"Bijwerking voor de plugins na een afgelopen tijdsperiode. Het automatisch "
-"bijwerken bij het opstarten is uitgeschakeld."
+"Bijwerken van plug-ins na verloop van tijdinterval uitvoeren. Automatisch "
+"bijwerken bij opstarten is ingeschakeld."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324
@@ -18249,6 +18821,6 @@
 "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
 msgstr ""
-"Onverwachte waarde ''{0}'' voor instelling ''{1}''. Verondersteld is waarde "
-"''vraag''."
+"Onverwachte waarde ''{0}'' voor voorkeur ''{1}''. Veronderstelde waarde voor "
+"''ask''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:362
@@ -18260,9 +18832,9 @@
 "are:"
 msgstr[0] ""
-"Plugin {0} vereist een plugin die niet werd gevonden. De ontbrekende plugin "
-"is:"
+"Plug-in {0} vereist een plug-in die niet werd gevonden. De ontbrekende plug-"
+"in is:"
 msgstr[1] ""
-"Plugin {0} vereist {1} plugins die niet werden gevonden. De ontbrekende "
-"plugins zijn:"
+"Plug-in {0} vereist {1} plug-ins die niet werden gevonden. De ontbrekende "
+"plug-ins zijn:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:384
@@ -18272,16 +18844,16 @@
 "<br>You have to update JOSM in order to use this plugin.</html>"
 msgstr ""
-"<html>Plugin {0} vereist JOSM versie {1}. De huidige JOSM versie is {2}."
-"<br>Je dient JOSM bij te werken om deze plugin te kunnen gebruiken.</html>"
+"<html>Plug-in {0} vereist JOSM-versie {1}. De huidige versie van JOSM is {2}."
+"<br>U moet JOSM bijwerken om deze plug-in te kunnen gebruiken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:471
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?"
+msgstr "Kon plug-in {0} niet laden. Verwijderen uit voorkeuren?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:475
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
-msgstr "laden van plugin''{0}'' (versie {1})"
+msgstr "laden van plug-in''{0}'' (versie {1})"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
@@ -18291,47 +18863,49 @@
 "not found.<br>Delete from preferences?</html>"
 msgstr ""
+"<html>Kon plug-in {0} niet laden omdat de<br>hoofdklasse ''{1}'' voor de "
+"plug-in niet werd gevonden.<br>Verwijderen uit voorkeuren?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:505
 msgid "Loading plugins ..."
-msgstr "Plugins laden ..."
+msgstr "Plug-ins laden ..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:506
 msgid "Checking plugin preconditions..."
-msgstr "Testen van de vereisten voor plugins..."
+msgstr "Controleren van de vereisten voor plug-ins..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:533
 #, java-format
 msgid "Loading plugin ''{0}''..."
-msgstr "Laden van plugin ''{0}''..."
+msgstr "Laden van plug-in ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:614
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] "JOSM kon geen informatie vinden over volgende plugin:"
-msgstr[1] "JOSM kon geen informatie vinden over volgende plugins:"
+msgstr[0] "JOSM kon geen informatie vinden over volgende plug-in:"
+msgstr[1] "JOSM kon geen informatie vinden over de volgende plug-ins:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:622
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "De plug-in zal niet worden geladen."
+msgstr[1] "De plug-ins zullen niet worden geladen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
 msgid "Determine plugins to load..."
-msgstr ""
+msgstr "Bepalen welke plug-ins moeten worden geladen..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:654
 msgid "Removing deprecated plugins..."
-msgstr ""
+msgstr "Verwijderen van vervallen plug-ins..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:656
 msgid "Removing unmaintained plugins..."
-msgstr ""
+msgstr "Verwijderen van niet onderhouden plug-ins..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:680
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bijwerken van de volgende plug-in is mislukt:"
+msgstr[1] "Bijwerken van de volgende plug-ins is mislukt:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:691
@@ -18343,14 +18917,18 @@
 "them manually."
 msgstr[0] ""
+"Open het dialoogvenster Voorkeuren nadat JOSM is opgestart en probeer "
+"handmatig bij te werken."
 msgstr[1] ""
+"Open het dialoogvenster Voorkeuren nadat JOSM is opgestart en probeer ze "
+"handmatig bij te werken."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:699
 msgid "Plugin update failed"
-msgstr ""
+msgstr "Bijwerken van plug-in mislukt"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:735
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739
 msgid "Warning: failed to download plugin information list"
-msgstr ""
+msgstr "Waarschuwing: downloaden van informatielijst van plug-in mislukt"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:801
@@ -18358,15 +18936,15 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:899
 msgid "Disable plugin"
-msgstr "Plugin uitschakelen"
+msgstr "Plug-in uitschakelen"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:803
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr ""
+msgstr "Klik om de plug-in ''{0}'' te verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:905
 msgid "Keep plugin"
-msgstr ""
+msgstr "Plug-in behouden"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:809
@@ -18374,10 +18952,10 @@
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
-msgstr ""
+msgstr "Klik om de plug-in ''{0}'' te behouden"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:883
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "Waarschuwing: verwijderen van de gedateerde plug-in ''{0}'' mislukt."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:884
@@ -18388,4 +18966,7 @@
 "installation. JOSM is still going to load the old plugin version."
 msgstr ""
+"Waarschuwing: installeren van de reeds gedownloade plug-in ''{0}'' mislukt. "
+"Installatie wordt overgeslagen. JOSM laadt nog steeds de oude versie van de "
+"plug-in."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:889
@@ -18395,9 +18976,11 @@
 "''{1}''. Renaming failed."
 msgstr ""
+"Waarschuwing: installeren van plug-in ''{0}'' vanuit het tijdelijke "
+"gedownloade bestand ''{1}'' mislukt. Hernoemen mislukt."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr ""
+msgstr "Klik om de plug-in ''{0}'' uit te schakelen"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:914
@@ -18406,11 +18989,11 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
-"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de "
-"\"{0}\"-plugin."
+"Er trad een onverwachte uitzondering op die mogelijk afkomstig van de plug-"
+"in \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:917
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
-msgstr "Volgens de informatie in de plugin, is de auteur {0}."
+msgstr "Volgens de informatie in de plug-in, is de auteur {0}."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:920
@@ -18418,10 +19001,10 @@
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
-"Probeer eerst de plugin te updaten naar de nieuwste versie voordat je een "
+"Probeer eerst de plug-in bij te werken naar de nieuwste versie voordat u een "
 "fout rapporteert."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:922
 msgid "Should the plugin be disabled?"
-msgstr "Moet de plugin worden uitgeschakeld?"
+msgstr "Zou de plug-in moeten worden uitgeschakeld?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:999
@@ -18430,10 +19013,10 @@
 "unload the plugin."
 msgstr ""
-"De plugin is uit de configuratie verwijderd. Start JOSM opnieuw om de plugin "
-"uit de applicatie te halen."
+"De plug-in is verwijderd uit de configuratie. Start JOSM opnieuw op om de "
+"plug-in te ontladen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1042
 msgid "Plugin information"
-msgstr ""
+msgstr "Informatie over plug-in"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1047
@@ -18447,23 +19030,25 @@
 "change it later)"
 msgstr ""
+"Niet opnieuw vragen en onthoud mijn beslissing (ga naar Voorkeuren->Plug-ins "
+"om het later te wijzigen)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:88
 #, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "Het bestand ''{0}'' voor de plug-in bevat geen Manifest."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:168
 #, java-format
 msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Ongeldige URL ''{0}'' in plug-in {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:252
 msgid "More info..."
-msgstr ""
+msgstr "Meer info..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:256
 #, java-format
 msgid "<b>Plugin provided by an external source:</b> {0}"
-msgstr ""
+msgstr "<b>Plug-in verschaft door een externe bron:</b> {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
@@ -18472,17 +19057,19 @@
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
 msgstr ""
+"Mislukt om informatie voor de plug-in te maken uit manifest voor plug-in "
+"''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:99
 msgid "Illegal entry in plugin list."
-msgstr ""
+msgstr "Ongeldig item in lijst voor plug-in."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:42
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:47
 msgid "Reading local plugin information.."
-msgstr ""
+msgstr "Lezen van informatie voor locale plug-in.."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:91
 msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Verwerken van bestanden in cache voor site van plug-in..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:95
@@ -18491,5 +19078,5 @@
 #, java-format
 msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Verwerken van bestand ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:99
@@ -18498,17 +19085,20 @@
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
+"Waarschuwing: scannen van bestand ''{0}'' voor informatie over plug-in "
+"mislukt. Overslaan."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:116
 msgid "Processing plugin site cache icon files..."
 msgstr ""
+"Verwerken van bestanden voor pictogrammen in cache voor site van plug-in..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:140
 msgid "Processing plugin files..."
-msgstr ""
+msgstr "Verwerken van bestanden van plug-in..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:67
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:78
 msgid "Download plugin list..."
-msgstr ""
+msgstr "Downloaden van lijst voor plug-in..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:160
@@ -18516,5 +19106,5 @@
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
-msgstr ""
+msgstr "Downloaden van lijst voor plug-in vanaf ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263
@@ -18524,14 +19114,16 @@
 "from plugin site ''{1}''."
 msgstr ""
+"Waarschuwing: maken van map voor plug-in ''{0}'' mislukt. Kan geen lijst "
+"voor plug-in opslaan vanaf de site voor plug-in ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:267
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Schrijven van lijst voor plug-in naar locale cache ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:311
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Ontleden van lijst voor plug-in vanaf site ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:316
@@ -18542,9 +19134,11 @@
 "Exception was: {1}"
 msgstr ""
+"Ontleden van document voor lijst voor plug-in vanaf site ''{0}'' mislukt "
+"Site wordt overgeslagen. Uitzondering was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:348
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Verwerking van lijst voor plug-in vanaf site ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
@@ -18554,9 +19148,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
 msgid "unspecified reason"
-msgstr ""
+msgstr "niet gespecificeerde reden"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:348
 msgid "Error playing sound"
-msgstr "Fout tijdens afspelen van het geluid"
+msgstr "Fout tijdens afspelen van geluid"
 
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
@@ -18576,4 +19170,7 @@
 "file a bug report."
 msgstr ""
+"Er trad een onverwachte uitzondering op.<br>Dit is altijd een fout in de "
+"codering. Indien u de laatste versie gebruikt van<br>JOSM, overweeg dan om "
+"aardig te zijn en een foutenrapport in te dienen."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
@@ -18586,4 +19183,6 @@
 "sure you have updated to the latest version of JOSM here:"
 msgstr ""
+"U bent een fout tegengekomen in JOSM. Vóórdat u een foutenrapport indient, "
+"zorg er voor dat u hier bent bijgewerkt naar de laatste versie van JOSM:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:113
@@ -18592,4 +19191,7 @@
 "bug report in our bugtracker using this link:"
 msgstr ""
+"U zou ook uw plug-ins moeten bijwerken. Als geen van beide helpt dien dan "
+"een foutenrapport in in onze database voor problemen met behulp van deze "
+"koppeling:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:117
@@ -18599,4 +19201,7 @@
 "supply as much detail as possible."
 msgstr ""
+"Daar zou de hieronder vermelde informatie over de fout al voor u moeten zijn "
+"ingevuld. Vermeld informatie over hoe de fout kan worden gereproduceerd en "
+"probeer zo veel mogelijk details te geven als mogelijk."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
@@ -18605,4 +19210,6 @@
 "information below at this URL:"
 msgstr ""
+"Als alternatief: als dat niet werkt kunt u de onderstaande informatie "
+"handmatig invoeren bij deze URL:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
@@ -18612,5 +19219,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:139
 msgid "You have encountered a bug in JOSM"
-msgstr ""
+msgstr "U bent een probleem tegengekomen in JOSM"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:43
@@ -18620,4 +19227,7 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
+"<html>Initialiseren van communicatie met de server van OSM {0} mislukt."
+"<br>Controleer de URL voor de server in uw voorkeuren en uw verbinding met "
+"internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:58
@@ -18629,4 +19239,8 @@
 "Access Token.</html>"
 msgstr ""
+"<html>Authenticatie met de server van OSM ''{0}'' mislukt.<br>U gebruikt "
+"OAuth om te authenticeren maar momenteel is er geen<br>Toegangstoken voor "
+"OAuth geconfigureerd.<br>Open het dialoogvenster Voorkeuren en genereer of "
+"voer een Toegangstoken in.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:79
@@ -18637,4 +19251,7 @@
 "reference to relation {0}, and upload again.</html>"
 msgstr ""
+"<html><strong>Relatie {0}</strong> verwijderen <strong>mislukt</strong>. Er "
+"wordt nog steeds naar verwezen naar door de relatie {1}.<br>Laad relatie "
+"{1}, verwijder de verwijzing naar relatie {0}, en upload opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:106
@@ -18645,4 +19262,7 @@
 "html>"
 msgstr ""
+"<html>Uploaden naar de server <strong>mislukt</strong> omdat uw "
+"huidige<br>gegevensset in strijd is met een voorwaarde.<br>Het foutenbericht "
+"is:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:114
@@ -18653,4 +19273,7 @@
 "html>"
 msgstr ""
+"<html>Authenticatie bij de server van OSM met de gebruikersnaam ''{0}'' is "
+"mislukt.<br>Controleer de gebruikersnaam en het wachtwoord in de voorkeuren "
+"van JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:124
@@ -18661,4 +19284,7 @@
 "html>"
 msgstr ""
+"<html>Authenticatie bij de server van OSM met het token voor OAuth ''{0}'' "
+"is mislukt.<br>Start het dialoogvenster Voorkeuren en verkrijg een ander "
+"token voor OAuth.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:137
@@ -18668,4 +19294,7 @@
 "agree, but you must view them.</html>"
 msgstr ""
+"<html>Uw toegang tot de API is tijdelijk geschorst.<br>Log in bij de "
+"webinterface om de Voorwaarden voor gebruik te bekijken.<br>U hoeft er niet "
+"mee in te stemmen, maar u moet ze bekijken.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:154
@@ -18675,4 +19304,6 @@
 "following error:<br>''{0}''</html>"
 msgstr ""
+"<html>Autorisatie bij de server van OSM is mislukt.<br>De server "
+"rapporteerde de volgende fout:<br>''{0}''</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
@@ -18684,4 +19315,8 @@
 "html>"
 msgstr ""
+"<html>Autorisatie bij de server van OSM met het token ''{0}'' voor OAuth is "
+"mislukt.<br>Het token is niet geautoriseerd om toegang te krijgen tot de "
+"beveiligde bron<br>''{1}''.<br>Start het dialoogvenster Voorkeuren en "
+"verkrijg een ander token voor OAuth.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184
@@ -18691,8 +19326,10 @@
 "later.</html>"
 msgstr ""
+"<html>Communicatie met de server van OSM ''{0}'' verbroken. Probeer later "
+"nog eens.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
 msgid "no error message available"
-msgstr ""
+msgstr "geen foutenbericht beschikbaar"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:206
@@ -18704,4 +19341,8 @@
 "strong>: {2}</html>"
 msgstr ""
+"<html>Communicatie met de server van OSM ''{0}'' mislukt. De server "
+"antwoordde<br>met de volgende foutcode en het volgende foutenbericht:"
+"<br><strong>Foutcode:<strong> {1}<br><strong>Foutenbericht (niet vertaald)</"
+"strong>: {2}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
@@ -18711,4 +19352,6 @@
 "already been closed.</html>"
 msgstr ""
+"<html>Sluiten van wijzigingenset <strong>{0}</strong> mislukt <br>omdat die "
+"reeds gesloten was.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:250
@@ -18718,4 +19361,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
+"<html>Sluiten van wijzigingenset <strong>{0}</strong> mislukt <br>omdat die "
+"al was gesloten op {1}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:259
@@ -18725,8 +19370,11 @@
 "(untranslated):<br>{0}</html>"
 msgstr ""
+"<html>De server rapporteerde dat het een conflict heeft gedetecteerd."
+"<br>Foutenbericht (niet vertaald):<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:265
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
+"<html>De server rapporteerde dat het een conflict heeft gedetecteerd.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:280
@@ -18736,4 +19384,6 @@
 "already been closed on {1}.</html>"
 msgstr ""
+"<html>Uploaden naar wijzigingenset <strong>{0}</strong> mislukt<br>omdat die "
+"al is gesloten op {1}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:320
@@ -18744,4 +19394,8 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
+"<html>Openen van een verbinding naar de server of "
+"afstand<br>''{0}''<br>mislukt wegens veiligheidsredenen. Dit komt zeer "
+"waarschijnlijk omdat u werkt<br>binnen een applet en omdat u uw applet niet "
+"heeft geladen vanaf ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -18751,4 +19405,6 @@
 "check your internet connection.</html>"
 msgstr ""
+"<html>Openen van een verbinding naar de server of afstand<br>''{0}'' mislukt."
+"<br>Controleer uw verbinding met internet."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:353
@@ -18758,4 +19414,7 @@
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
 msgstr ""
+"<html>Uploaden van gegevens naar of downloaden van gegevens vanaf<br>''{0}'' "
+"mislukt<br>wegens een probleem met het overdragen van gegevens.<br>Details "
+"(niet vertaald): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:368
@@ -18765,4 +19424,7 @@
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
 msgstr ""
+"<html>Downloaden van gegevens mislukt. De indeling ervan is ofwel niet "
+"ondersteund, slecht gevormd en/of inconsistent.<br><br>Details (niet "
+"vertaald): {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:384
@@ -18772,9 +19434,12 @@
 "<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
+"<html>De server van OSM<br>''{0}''<br>rapporteerde een interne serverfout."
+"<br>Dit is zeer waarschijnlijk een tijdelijk probleem. Probeer het later "
+"opnieuw.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:398
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "De server van OSM ''{0}'' rapporteerde een slecht verzoek.<br>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:403
@@ -18784,9 +19449,12 @@
 "community."
 msgstr ""
+"Het gebied dat u probeerde te downloaden is te groot of uw verzoek was te "
+"groot.<br>Vraag om een kleiner gebied of gebruik een exportbestand dat is "
+"verschaft door de gemeenschap van OSM."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:406
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
-msgstr ""
+msgstr "<br>Foutenbericht (niet vertaald): {0}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:420
@@ -18798,4 +19466,9 @@
 "check the server''s address ''{0}'' for typos."
 msgstr ""
+"De server van OSM ''{0}'' kent geen object<br>dat u probeerde te lezen, bij "
+"te werken of te verwijderen. Ofwel bestaat het respectievelijke "
+"object<br>niet op de server of u gebruikt een ongeldige URL om er "
+"toegang<br>toe te krijgen. Controleer zorgvuldig het adres van de server "
+"''{0}'' op typefouten."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:447
@@ -18806,4 +19479,7 @@
 "preferences and your internet connection.</html>"
 msgstr ""
+"<html>Openen van een verbinding naar de server of afstand<br>''{0}'' mislukt."
+"<br>Naam van de host ''{1}'' kon niet worden gevonden. <br>Controleer de URL "
+"voor de API in uw voorkeuren en uw verbinding met internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:519
@@ -18815,11 +19491,16 @@
 "<br><br>The error message is:<br>{0}</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629
+"<html>De server rapporteert dat een object is verwijderd."
+"<br><strong>Uploaden mislukt</strong> als u probeerde dit object bij te "
+"werken of te verwijderen.<br> <strong>Downloaden mislukt</strong> als u "
+"probeerde dit object te downloaden.<br><br>Het foutenbericht is:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:630
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
-msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen."
-
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:82
+msgstr "Kan geen vertaling voor de locale {0} vinden. Val terug op {1}."
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:90
 #: ../core/src/org/openstreetmap/josm/tools/ImageRequest.java:81
 #, java-format
@@ -18828,6 +19509,8 @@
 "problem. JOSM will stop working."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283
+"Fataal: lokaliseren van afbeelding ''{0}'' mislukt. Dit is een serieus "
+"probleem in de configuratie. JOSM zal nu stoppen."
+
+#: ../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
@@ -18835,7 +19518,9 @@
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:340
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:354
+"Waarschuwing: afhandelen van zip-bestand ''{0}'' mislukt. Uitzondering was: "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:387
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:401
 #, java-format
 msgid ""
@@ -18843,4 +19528,6 @@
 "was: {1}"
 msgstr ""
+"Waarschuwing: toegang tot map ''{0}'' mislukt wegens veiligheidsredenen. "
+"Uitzondering was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:27
@@ -18850,4 +19537,6 @@
 "''{0}''. Using default code ''en''."
 msgstr ""
+"Waarschuwing: voorvoegsel voor wiki-taal afleiden vanuit de locale code "
+"''{0}'' van JOSM mislukt. Gebruiken van standaardcode ''en''."
 
 #: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:52
@@ -18856,4 +19545,6 @@
 "platform first."
 msgstr ""
+"Het openen van de URL is mislukt Er is momenteel geen platform ingesteld. "
+"Stel eerst een platform in."
 
 #. This list if far from complete!
@@ -18868,7 +19559,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:57
 msgid "unused"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+msgstr "niet gebruikt"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498
 #, java-format
 msgid ""
@@ -18877,17 +19568,18 @@
 "\n"
 msgstr ""
-"Het instellen van sneltoets \"{0}\" voor opdracht \"{1}\" ({2}) is mislukt.\n"
-"De gekozen sneltoets is reeds toegewezen aan \"{3}\" ({4}).\n"
+"Het instellen van de sneltoets \"{0}\" voor de actie \"{1}\" ({2}) is "
+"mislukt\n"
+"omdat de gekozen sneltoets al is toegewezen aan de actie \"{3}\" ({4}).\n"
 "\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"
 "\n"
 msgstr ""
-"Deze opdracht heeft geen sneltoets.\n"
+"Deze actie zal geen sneltoets hebben.\n"
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505
 #, java-format
 msgid ""
@@ -18895,10 +19587,10 @@
 "\n"
 msgstr ""
-"De sneltoets \"{0}\" gebruiken als alternatief.\n"
+"Sneltoets \"{0}\" gebruiken in plaats daarvan.\n"
 "\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 "(Tip: je kunt sneltoetsen in Voorkeuren bewerken.)"
+msgstr "(Tip: je kunt in Voorkeuren de sneltoetsen bewerken.)"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
@@ -18908,4 +19600,5 @@
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
 msgstr ""
+"Waarschuwing: lezen van MOTD vanaf ''{0}'' mislukt. Uitzondering was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
@@ -18916,4 +19609,6 @@
 "was: {1}"
 msgstr ""
+"Waarschuwing: lezen van MOTD vanaf ''{0}'' mislukt wegens "
+"veiligheidsredenen. Uitzondering was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
@@ -18923,4 +19618,6 @@
 "geometry from preferences."
 msgstr ""
+"Voorkeur met toets ''{0}'' bevat niet ''{1}''. Kan geen geometrie voor het "
+"venster herstellen vanuit de voorkeuren."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
@@ -18930,4 +19627,7 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
+"Voorkeur met toets ''{0}'' bevat geen integer (geheel getal) waarde voor "
+"''{1}''. Kreeg {2}. Kan geen geometrie voor het venster herstellen vanuit de "
+"voorkeuren."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
@@ -18937,4 +19637,7 @@
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
+"Veld ''{1}'' ontleden mislukt in voorkeur met toets ''{0}''. Uitzondering "
+"was: {2}. Kan geen geometrie voor het venster herstellen vanuit de "
+"voorkeuren."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
@@ -18944,22 +19647,24 @@
 "from preferences."
 msgstr ""
+"Voorkeur met toets ''{0}'' bestaat niet. Kan geen geometrie voor het venster "
+"herstellen vanuit de voorkeuren."
 
 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:350
 msgid "Failed to load XML schema."
-msgstr ""
+msgstr "Laden van XML-schema mislukt."
 
 #: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:14
 #, java-format
 msgid "Unexpected token ({0}) on position {1}"
-msgstr ""
+msgstr "Onverwacht token ({0}) op positie {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:19
 #, java-format
 msgid "Unexpected token on position {0}. Expected {1}, found {2}"
-msgstr ""
+msgstr "Onverwacht token op positie {0}. Verwacht {1}, gevonden {2}"
 
 #: ../core/src/org/openstreetmap/josm/tools/template_engine/ParseError.java:24
 msgid "Error while parsing search expression"
-msgstr ""
+msgstr "Fout tijdens ontleden van uitdrukking om te zoeken."
 
 #. *
@@ -18975,5 +19680,5 @@
 "area, or use planet.osm"
 msgstr ""
-"Je vraagt te veel knopen (limiet is 50.000). Kies een kleiner gebied of "
+"U verzocht teveel knopen (grens is 50.000). Verzoek een kleiner gebied of "
 "gebruik planet.osm"
 
@@ -18981,5 +19686,5 @@
 #: build/specialmessages.java:9
 msgid "Database offline for maintenance"
-msgstr "Vanwege onderhoud is de database niet bereikbaar"
+msgstr "Wegens onderhoud is de database niet bereikbaar"
 
 #. OSM server message
@@ -18989,21 +19694,21 @@
 "request a smaller area, or use planet.osm"
 msgstr ""
-"De grootte van het maximale omvattende gebied is 0.25 en je verzoek is te "
-"groot. Kies een kleiner gebied of gebruik planet.osm"
+"De maximale grootte voor de begrenzing is 0,25, en uw verzoek was te groot. "
+"Verzoek een kleiner gebied of gebruik planet.osm"
 
 #. JOSM server message
 #: build/specialmessages.java:11
 msgid "JOSM-Trac login at josm.openstreetmap.de"
-msgstr ""
+msgstr "JOSM-Trac log in op josm.openstreetmap.de"
 
 #. Java message loading audio data
 #: build/specialmessages.java:12
 msgid "could not get audio input stream from input URL"
-msgstr "Kan geen geluidsinvoerstroom uit invoer-URL krijgen"
+msgstr "Kan geen invoerstroom voor geluid uit URL voor invoer krijgen"
 
 #. Java message loading audio data
 #: build/specialmessages.java:13
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Audiospeler niet beschikbaar"
 
 #. OSM server message
@@ -19011,9 +19716,10 @@
 msgid "You must make your edits public to upload new data"
 msgstr ""
+"U moet uw bewerkingen publiek maken om nieuwe gegevens te kunnen uploaden"
 
 #. Nominatim search place type
 #: build/specialmessages.java:15
 msgid "town"
-msgstr ""
+msgstr "dorp"
 
 #. Landuse type used in multipolygons
@@ -19021,5 +19727,5 @@
 msgctxt "landuse"
 msgid "forest"
-msgstr ""
+msgstr "bosbouw"
 
 #. Landuse type used in multipolygons
@@ -19027,5 +19733,5 @@
 msgctxt "landuse"
 msgid "farmland"
-msgstr ""
+msgstr "landbouwgrond"
 
 #. Landuse type used in multipolygons
@@ -19033,5 +19739,5 @@
 msgctxt "landuse"
 msgid "residential"
-msgstr ""
+msgstr "woongebied"
 
 #. Landuse type used in multipolygons
@@ -19039,5 +19745,5 @@
 msgctxt "natural"
 msgid "scrub"
-msgstr ""
+msgstr "ruig land"
 
 #. relation type
@@ -19045,5 +19751,5 @@
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr ""
+msgstr "associatedStreet"
 
 #. relation type
@@ -19051,5 +19757,5 @@
 msgctxt "Relation type"
 msgid "boundary"
-msgstr ""
+msgstr "grens"
 
 #. relation type
@@ -19057,5 +19763,5 @@
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr ""
+msgstr "handhaving"
 
 #. relation type
@@ -19063,5 +19769,5 @@
 msgctxt "Relation type"
 msgid "line"
-msgstr ""
+msgstr "lijn"
 
 #. relation type
@@ -19069,5 +19775,5 @@
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr ""
+msgstr "multipolygoon"
 
 #. relation type
@@ -19075,5 +19781,5 @@
 msgctxt "Relation type"
 msgid "network"
-msgstr ""
+msgstr "netwerk"
 
 #. relation type
@@ -19081,5 +19787,5 @@
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "bus_hokje"
 
 #. relation type
@@ -19087,5 +19793,5 @@
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "beperking"
 
 #. relation type
@@ -19093,5 +19799,5 @@
 msgctxt "Relation type"
 msgid "route"
-msgstr ""
+msgstr "route"
 
 #. relation type
@@ -19099,5 +19805,5 @@
 msgctxt "Relation type"
 msgid "site"
-msgstr ""
+msgstr "plaats"
 
 #. relation type
@@ -19105,5 +19811,5 @@
 msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
+msgstr "waterweg"
 
 #. relation place type
@@ -19111,5 +19817,5 @@
 msgctxt "Place type"
 msgid "city"
-msgstr ""
+msgstr "stad"
 
 #. relation place type
@@ -19117,5 +19823,5 @@
 msgctxt "Place type"
 msgid "locality"
-msgstr ""
+msgstr "plaats"
 
 #. relation place type
@@ -19123,5 +19829,5 @@
 msgctxt "Place type"
 msgid "village"
-msgstr ""
+msgstr "klein dorp"
 
 #. relation place type
@@ -19129,5 +19835,5 @@
 msgctxt "Place type"
 msgid "town"
-msgstr ""
+msgstr "dorp"
 
 #. relation place type
@@ -19135,5 +19841,5 @@
 msgctxt "Place type"
 msgid "borough"
-msgstr ""
+msgstr "borough"
 
 #. relation place type
@@ -19141,5 +19847,5 @@
 msgctxt "Place type"
 msgid "municipality"
-msgstr ""
+msgstr "gemeente"
 
 #. relation place type
@@ -19147,5 +19853,5 @@
 msgctxt "Place type"
 msgid "island"
-msgstr ""
+msgstr "eiland"
 
 #. relation place type
@@ -19153,5 +19859,5 @@
 msgctxt "Place type"
 msgid "county"
-msgstr ""
+msgstr "provincie"
 
 #. relation place type
@@ -19159,5 +19865,5 @@
 msgctxt "Place type"
 msgid "hamlet"
-msgstr ""
+msgstr "gehucht"
 
 #. relation place type
@@ -19165,50 +19871,50 @@
 msgctxt "Place type"
 msgid "suburb"
-msgstr ""
+msgstr "deelgemeente"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:42
 msgid "All Files"
-msgstr ""
+msgstr "Alle bestanden"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:43
 msgid "Attributes"
-msgstr ""
+msgstr "Attributen"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:44
 msgid "Abort file chooser dialog"
-msgstr ""
+msgstr "Dialoogvenster Bestand kiezen verlaten"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:45
 msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "Dialoogvenster Bestand kiezen verlaten."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:47
 msgid "Create New Folder"
-msgstr ""
+msgstr "Nieuwe map maken"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:48
 msgid "Delete File"
-msgstr ""
+msgstr "Bestand verwijderen"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:50
 msgid "Enter file name:"
-msgstr ""
+msgstr "Bestandsnaam invoeren:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:51
 msgid "Enter path or folder name:"
-msgstr ""
+msgstr "Pad of naam van map invoeren:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:52
 msgid "Error "
-msgstr ""
+msgstr "Fout "
 
 #. Strings in JFileChooser
@@ -19216,85 +19922,85 @@
 #, java-format
 msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr ""
+msgstr "Fout bij hernoemen van bestand \"{0}\" naar \"{1}\""
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:54
 msgid "File name:"
-msgstr ""
+msgstr "Bestandsnaam:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:55
 msgid "File Name:"
-msgstr ""
+msgstr "Bestandsnaam:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:56
 msgid "FileChooser help."
-msgstr ""
+msgstr "Help bij Bestand kiezen."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:57
 msgid "Files"
-msgstr ""
+msgstr "Bestanden"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:58
 msgid "Files of type:"
-msgstr ""
+msgstr "Bestanden van type:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:59
 msgid "Files of Type:"
-msgstr ""
+msgstr "Bestanden van type:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:61
 msgid "Filter:"
-msgstr ""
+msgstr "Filter:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:62
 msgid "Folders"
-msgstr ""
+msgstr "Mappen"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:64
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:65
 msgid "List"
-msgstr ""
+msgstr "Lijst"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:66
 msgid "Look in:"
-msgstr ""
+msgstr "Kijk in:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:67
 msgid "Look In:"
-msgstr ""
+msgstr "Kijk in:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:68
 msgid "Modified"
-msgstr ""
+msgstr "Aangepast"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:69
 msgid "New Folder"
-msgstr ""
+msgstr "Nieuwe map"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:73
 msgid "Open selected file"
-msgstr ""
+msgstr "Open geselecteerd bestand"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:74
 msgid "Open selected file."
-msgstr ""
+msgstr "Open geselecteerd bestand."
 
 #. Strings in JFileChooser
@@ -19306,10 +20012,10 @@
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33
 msgid "Refresh"
-msgstr "Herteken"
+msgstr "Vernieuwen"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:76
 msgid "Rename File"
-msgstr ""
+msgstr "Bestand hernoemen"
 
 #. Strings in JFileChooser
@@ -19317,80 +20023,80 @@
 #, java-format
 msgid "Rename file \"{0}\" to"
-msgstr ""
+msgstr "Hernoem bestand \"{0}\" naar"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:79
 msgid "Save in:"
-msgstr ""
+msgstr "Opslaan in:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:80
 msgid "Save In:"
-msgstr ""
+msgstr "Opslaan in:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:81
 msgid "Save selected file."
-msgstr ""
+msgstr "Geselecteerd bestand opslaan."
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:82
 msgid "Selection:"
-msgstr ""
+msgstr "Selectie:"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:83
 msgid "Size"
-msgstr ""
+msgstr "Grootte"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:86
 msgid "Up One Level"
-msgstr ""
+msgstr "Eén niveau hoger"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:87
 msgid "Update"
-msgstr "Update"
+msgstr "Bijwerken"
 
 #. Strings in JFileChooser
 #: build/specialmessages.java:88
 msgid "Update directory listing."
-msgstr ""
+msgstr "Lijst van map bijwerken."
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:91
 msgid "Blue:"
-msgstr ""
+msgstr "Blauw:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:92
 msgid "Color Name:"
-msgstr ""
+msgstr "Naam van kleur:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:93
 msgid "Green:"
-msgstr ""
+msgstr "Groen:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:94
 msgid "Hue:"
-msgstr ""
+msgstr "Kleurtoon:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:95
 msgid "GTK Color Chooser"
-msgstr ""
+msgstr "GTK kleurenkiezer"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:96
 msgid "Red:"
-msgstr ""
+msgstr "Rood:"
 
 #. Strings in GTK ColorChooser
 #: build/specialmessages.java:97
 msgid "Saturation:"
-msgstr ""
+msgstr "Verzadiging:"
 
 #. Plugin AddrInterpolation
@@ -19400,4 +20106,7 @@
 "option to automatically generate individual house number nodes from a Way."
 msgstr ""
+"Groepeer de invoer van algemene Adres Interpolatie in één enkele "
+"dialoogvenster, naast een optie om automatisch individuele knopen voor "
+"huisnummers van een weg te genereren."
 
 #. Plugin alignways
@@ -19408,9 +20117,11 @@
 "around a chosen pivot."
 msgstr ""
+"Maakt een paar geselecteerde wegsegmenten parallel door één van hen te "
+"draaien langs een gekozen draaipunt."
 
 #. Plugin buildings_tools
 #: build/trans_plugins.java:7
 msgid "Tools for drawing buildings."
-msgstr ""
+msgstr "Programma's voor het tekenen van gebouwen."
 
 #. Plugin cadastre-fr
@@ -19418,4 +20129,5 @@
 msgid "A special handler for the French land registry WMS server."
 msgstr ""
+"Een speciale afhandeling voor de Franse landregistatie van de server van WMS."
 
 #. Plugin colorscheme
@@ -19428,4 +20140,9 @@
 "true :-)"
 msgstr ""
+"Maakt het de gebruiker mogelijk om verschillende kleurenschema's te maken  "
+"en daar tussen te schakelen. Wijzig eenvoudigweg de kleuren en maak een "
+"nieuw schema. Gebruikt om te schakelen naar een witte achtergrond met "
+"overeenkomende kleuren voor betere zichtbaarheid in helder zonlicht. Bekijk "
+"het dialoogvenster in Voorkeuren en ''Kaartinstellingen'' (raar maar waar :-)"
 
 #. Plugin ColumbusCSV
@@ -19435,4 +20152,6 @@
 "into a GPX layer."
 msgstr ""
+"Importeert merkgebonden CSV-bestanden van de logger van Columbus/Visiontac "
+"V-900 GPS in een GPX-laag."
 
 #. Plugin CommandLine
@@ -19442,14 +20161,16 @@
 "standard commands (arc, circle etc.)"
 msgstr ""
+"Implementeert een opdrachtregel end maakt het u mogelijk uw opdrachten te "
+"maken. Zie koppeling voor standaard opdrachten (boog, cirkel etc.)"
 
 #. Plugin conflation
 #: build/trans_plugins.java:17
 msgid "Tool for conflation (merging) data"
-msgstr ""
+msgstr "Programma voor samenbrengen (samenvoegen) van gegevens"
 
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:19
 msgid "Create a grid of ways."
-msgstr ""
+msgstr "Maak een raster van wegen."
 
 #. Plugin czechaddress
@@ -19458,4 +20179,6 @@
 "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
+"Maken en afhandelen van adresknopen en gebouwen binnen de Tsjechische "
+"Republiek."
 
 #. Plugin dataimport
@@ -19463,9 +20186,11 @@
 msgid "Allows to import various file formats into JOSM directly."
 msgstr ""
+"Maakt het mogelijk om verschillende bestandsindelingen direct in JOSM te "
+"importeren."
 
 #. Plugin DirectDownload
 #: build/trans_plugins.java:25
 msgid "Download your GPX tracks from openstreetmap.org"
-msgstr ""
+msgstr "Downloaden van uw GPX-sporen vanaf openstreetmap.org"
 
 #. Plugin DirectUpload
@@ -19475,9 +20200,11 @@
 "openstreetmap.org."
 msgstr ""
+"Deze plug-in upload GPS-sporen van de huidige actieve laag in JOSM direct "
+"naar openstreetmap.org."
 
 #. Plugin download_along
 #: build/trans_plugins.java:29
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "Downloaden van gegevens van OSM langs een weg"
 
 #. Plugin editgpx
@@ -19487,4 +20214,6 @@
 "very fast."
 msgstr ""
+"Maakt het de gebruiker mogelijk om tijdstempels te anonimiseren en grote "
+"delen van enorme GPX-sporen heel snel te verwijderen."
 
 #. Plugin ElevationProfile
@@ -19492,9 +20221,11 @@
 msgid "Shows the elevation profile and some statistical data of a GPX track."
 msgstr ""
+"Geeft het hoogteprofiel en enige statistische gegevens weer van een GPX-"
+"spoor."
 
 #. Plugin epci-fr
 #: build/trans_plugins.java:35
 msgid "Handling of French EPCIs (boundary=local_authority)"
-msgstr ""
+msgstr "Afhandeling van Franse EPCI's (boundary=local_authority)"
 
 #. Plugin epsg31287
@@ -19504,4 +20235,7 @@
 "Conic. For use with WMS plugin to load geoimage.at WMS, see link for details"
 msgstr ""
+"Stlet de huidige projectie in op EPSG:31287 - Bessel 1841 in Lambert "
+"Conformal Conic. Om te gebruiken met de WMS-plug-in om geoimage.at WMS te "
+"laden, bekijk de koppeling voor details"
 
 #. Plugin ext_tools
@@ -19509,15 +20243,15 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
 msgid "Use external scripts in JOSM"
-msgstr ""
+msgstr "Externe scripts gebruiken in JOSM"
 
 #. Plugin FastDraw
 #: build/trans_plugins.java:41
 msgid "Fast drawing ways by mouse"
-msgstr ""
+msgstr "Snel tekenen van wegen met de muis"
 
 #. Plugin FixAddresses
 #: build/trans_plugins.java:43
 msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr ""
+msgstr "Zoekt en repareert ongeldige adressen op een comfortabele manier."
 
 #. Plugin globalsat
@@ -19525,22 +20259,29 @@
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
+"Downloaden van GPS-punten vanaf Globalsat dg100 gegevenslogger direct in "
+"JOSM."
 
 #. Plugin gpxfilter
 #: build/trans_plugins.java:47
 msgid "Allows to filter out unnecessary GPS tracks"
+msgstr "Maakt het mogelijk niet noodzakelijke GPS-sporen uit te filteren"
+
+#. 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 ""
+msgstr "Visualiseert route-informatie als een route-afbeelding."
 
 #. Plugin imageryadjust
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
+msgstr "WMSPlugin-stijl afbeeldingen aanpassen van kaartmodus"
 
 #. 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 "
@@ -19548,17 +20289,22 @@
 "matches the filename of an image."
 msgstr ""
+"Een andere plug-in om afbeeldingen overeen te laten komen met wegpunten in "
+"een GPX-bestand. Een overeenkomst wordt gemaakt als de attributen ''name'', "
+"''cmt'' of ''desc'' van een tag van een wegpunt overeenkomen met de "
+"bestandsnaam van een afbeelding."
 
 #. 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 ""
+"Plug-in voor het importeren van afbeeldingen met ruimtelijke verwijzingen"
 
 #. Plugin importvec
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Import vector graphics (SVG)"
-msgstr ""
+msgstr "Importeren van vectorafbeeldingen (SVG)"
 
 #. 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 "
@@ -19566,44 +20312,56 @@
 "quicken the editing process."
 msgstr ""
+"Kan handig zijn als u de nauwkeurigheid van bestaande wegen verbetert. Het "
+"idee van de plug-in is om het slepen en neerzetten van knopen te vervangen "
+"door klikken om het bewerkingsproces te versnellen."
 
 #. Plugin InfoMode
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Extra information about current layer objects pop ups - currently GPX "
 "trackpoint info"
 msgstr ""
+"Extra informatie over objecten op de huidige laag komt naar voren - "
+"momenteel informatie over het GPX-punt van het spoor"
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "A helper for IRS satellite adjustment."
-msgstr ""
+msgstr "Een hulpprogramma voor aanpassen van IRS-satelliet."
 
 #. 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 "
 "junction or searches in a subset of channels for junctions"
 msgstr ""
+"maakt een grafische weergave van verkeersstromen en controleert een "
+"onderverzameling van verkeersstromen als het een kruising is of zoekt in een "
+"onderverzameling van verkeersstromen naar kruisingen"
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "Helpt bij maken van vectoren in WMS-afbeeldingen."
 
 #. 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 "
 "change."
 msgstr ""
+"Controleert of alle gebruikers die hebben bijgedragen aan een object hebben "
+"ingesteld met de wijziging van de licentie."
 
 #. 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."
 msgstr ""
+"Ondersteunt live GPS-invoer (bewegende punt) via een verbinding met de "
+"server van gpsd."
 
 #. 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 "
@@ -19611,7 +20369,10 @@
 "this plugin."
 msgstr ""
+"De MapDust Plug-In geeft de foutenrapporten voor MapDust weer op de kaart. U "
+"kunt foutenrapporten maken, sluiten, ongeldig verklaren, opnieuw openen en "
+"opmerking plaatsen door deze plug-in te gebruiken."
 
 #. 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 "
@@ -19619,34 +20380,43 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"Verschaft een dialoogvenster voor metingen en een laag om lengte en hoek van "
+"segmenten te meten, gebied omgeven door een (eenvoudige) gesloten weg en "
+"paden van metingen te maken (die ook kunnen worden geïmporteerd vanuit een "
+"GPS-laag)."
 
 #. Plugin merge-overlap
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Merge overlapping part of ways."
-msgstr ""
+msgstr "Overlappende delen van wegen samenvoegen."
 
 #. 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 ""
+msgstr "Voegt Niet linksaf slaan toe voor sets van 4 of 5 wegen"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Simply convert an area to a multipolygon."
-msgstr ""
+msgstr "Eenvoudig converteren van een gebied naar een multipolygoon."
 
 #. 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 ""
+"Maakt het mogelijk om in één keer tags voor attributen toe te wijzen aan "
+"alle objecten in een geselecteerd gebied"
 
 #. 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. "
 "(KWallet and gnome-keyring are supported.)"
 msgstr ""
+"Gebruik de beheerder voor wachtwoorden van uw systeem voor het opslaan van "
+"de gebruikersnaam en wachtwoord voor de API. (KWallet en gnome-keyring "
+"worden ondersteund.)"
 
 #. 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 "
@@ -19654,84 +20424,98 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
+"Simuleert een klik  als u een kleine korte sleep uitvoert. Dit is handig "
+"voor pennen voor tabletten, als u problemen hebt met het klikken op de "
+"tablet zonder de muis te verplaatsen (algemeen probleem Java - tablet)."
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "extended options for editing opening_hours"
-msgstr ""
+msgstr "uitgebreide opties voor het bewerken van opening_hours"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Imports issues from OpenStreetBugs"
-msgstr ""
+msgstr "Importeert problemen vanaf OpenStreetBugs"
 
 #. 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"
 msgstr ""
+"Maakt het mogelijk GPX/OSM-bestanden te openen die het momenteel zichtbare "
+"schermgebied kruisen"
 
 #. 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."
 msgstr ""
+"Start Firefox om het momenteel zichtbare scherm als een keurige SVG-"
+"afbeelding weer te geven."
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid "Import PDF file and convert to ways."
-msgstr ""
+msgstr "Importeert PDF-bestand en converteert naar wegen."
 
 #. 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 "
 "right click menu of the image layer."
 msgstr ""
+"Schrijft informatie over de GPS-positie naar de kop van het "
+"afbeeldingsbestand. Voer deze mogelijkheid uit via het rechtsklik-menu van "
+"de afbeeldingslaag."
 
 #. 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 "
 "align it with the map."
 msgstr ""
+"Deze plug-in maakt het mogelijk om elke afbeelding als achtergrond in de "
+"bewerker te gebruiken en uit te lijnen met de kaart."
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
+msgstr "Het grote JGoodies Plastic weergave en vormgeving."
 
 #. Plugin proj4j
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid "adds projections from Proj4J"
-msgstr ""
+msgstr "voegt projecties toe van Proj4J"
 
 #. 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."
 msgstr ""
+"Deze plug-in vereenvoudigt het mappen en bewerking van routes van het "
+"openbaar vervoer."
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid "Relation and multipolygon creating and editing panel."
-msgstr ""
+msgstr "Venster voor bewerken en maken van relatie en multipolygoon."
 
 #. Plugin restart
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
-msgstr ""
+msgstr "Voegt het item \"JOSM opnieuw starten\" toe aan het menu Bestand."
 
 #. Plugin reverter
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Plugin for reverting changesets"
-msgstr ""
+msgstr "Plug-in voor het omdraaien van wijzigingensets"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid "Use rgis.spb.ru image as overlay"
-msgstr ""
+msgstr "Gebruik afbeelding rgis.spb.ru als bekleding"
 
 #. 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 "
@@ -19739,42 +20523,54 @@
 "properties window. Available country presets: Germany."
 msgstr ""
+"Plug-in voor taggen van objecten gebaseerd op een selectie van "
+"verkeersborden. Het dialoogvenster kan worden geopend door te klikken op een "
+"klein pictogram in de rechter bovenhoek van het venster Eigenschappen. "
+"Beschikbare voorkeuren voor land: Duitsland."
 
 #. Plugin routes
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
 "defined in routes.xml file in plugin directory"
 msgstr ""
+"Rendert routes (bus, wandelroutes, fietsroutes, ..). Types van routes moeten "
+"zijn gedefinieerd in het bestand routes.xml in de map van de plug-in"
 
 #. Plugin routing
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Verschaft mogelijkheden voor routebepaling."
 
 #. 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 "
 "constrained by maximum removed area size. Also average nearby nodes."
 msgstr ""
+"Vereenvoudigt gebieden door knopen te verwijderen uit zeer stompe hoeken. "
+"Dit kan worden beperkt door de grootte van het te verwijderen gebied te "
+"maximaliseren. Ook gemiddelde nabij knopen."
 
 #. 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 ""
+msgstr "Maken en bewerken van zeekaarten voor OpenSeaMap"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
+"Maakt het mogelijk markeringen/knopen toe te voegen op huidige GPS-posities."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
+"verschaft een dialoogvenster voor het bewerken van tags in een tabellarisch "
+"raster."
 
 #. 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 "
@@ -19782,59 +20578,73 @@
 "the jar-file as standalone as well."
 msgstr ""
+"Voegt een tester voor de voorkeuze van taggen toe aan het menu Help, wat u "
+"helpt bij het ontwikkelen van voorkeuzes voor tags (snel voorbeeld van het "
+"venster dat tevoorschijn komt). U kunt het jar-bestand ook als een "
+"zelfstandig programma starten."
 
 #. Plugin terracer
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Make terraced houses out of single blocks."
-msgstr ""
+msgstr "Maak rijtjeswoningen uit één enkel blok."
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid "Create and edit seamarks for OpenSeaMap"
-msgstr ""
+msgstr "Maken en bewerken van markeringen op zee voor OpenSeaMap"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
 "Currently adds only one button to slip the map."
 msgstr ""
+"Verschaft hulpknoppen om werken met één enkele muisknop mogelijk te maken "
+"(stylus). Voegt momenteel slechts één knop toe om de kaart te verschuiven."
 
 #. Plugin Tracer
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
 "to be running."
 msgstr ""
+"Traceert gebouwen vanaf de Tsjechische kadastrale kaart. Heeft TracerServer "
+"(.NET of Mono) nodig om te kunnen worden uitgevoerd."
 
 #. Plugin trustosm
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid "Plugin to digital sign OSM-Data"
-msgstr ""
+msgstr "Plug-in om gegevens voor OSM digitaal te ondertekenen"
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
+"Verschaft een directe GUI voor het toevoegen, bewerken en verwijderen van "
+"keerpunten."
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
+"De plug-in TurnRestrictions maakt het mogelijk informatie te onderhouden "
+"over beperkingen voor afslaan in de database van OpenStreetMap."
 
 #. Plugin undelete
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Allows undeleting object from OSM database"
 msgstr ""
+"Maakt het mogelijk om het verwijderen van een object uit de database van OSM "
+"ongedaan te maken"
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:155
 msgid "Several utilities that make your life easier."
-msgstr ""
+msgstr "Verschillende programma's die uw leven eenvoudiger maken."
 
 #. Plugin videomapping
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:157
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19842,33 +20652,43 @@
 "objects."
 msgstr ""
+"(Deze Plug-in is momenteel een doorlopend werkstuk!!!) Koppelt en "
+"synchroniseert een video met geo-verwijzingen tegen een GPS-spoor, om het te "
+"gebruiken om zichtbare objecten te identificeren."
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Ondersteunt het downloaden van getegelde, gescande kaarten vanaf walking-"
+"papers.org. Deze plug-in verkeert in het stadium van eerste ontwikkeling en "
+"kan fouten veroorzaken."
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
+"Eenvoudig downloaden langs een grote verzameling onderling verbonden wegen"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:161
+#: build/trans_plugins.java:163
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
+"Schakelt zoeken in naar wegpunten die zijn geïmporteerd uit een GPX-bestand."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:163
+#: build/trans_plugins.java:165
 msgid "Select a sequence of non-branching connected ways"
-msgstr ""
+msgstr "Selecteer een reeks niet-afgetakte verbonden wegen"
 
 #. 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 "
 "behind."
 msgstr ""
+"Stuur een racewagen van punt A naar punt B over luchtfoto's, stof "
+"achterlatend."
 
 #. <?xml version="1.0" encoding="UTF-8"?>
@@ -19968,5 +20788,5 @@
 #: build/trans_presets.java:106
 msgid "Highways"
-msgstr ""
+msgstr "Wegen"
 
 #. group "Highways/Streets"
@@ -20029,9 +20849,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 "Referentie"
@@ -20055,5 +20875,5 @@
 #: build/trans_presets.java:489
 msgid "Lanes"
-msgstr "Lanen"
+msgstr "Rijstroken"
 
 #. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
@@ -20084,6 +20904,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 "Max. snelheid (km/u)"
@@ -20132,11 +20952,11 @@
 #: 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 "Éénrichtingsweg"
+msgstr "Eénrichtingsweg"
 
 #. item "Highways/Streets/Motorway" check "Bridge"
@@ -20184,9 +21004,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 "Brug"
@@ -20227,9 +21047,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"
@@ -20268,9 +21088,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 "Verdieping"
@@ -20309,9 +21129,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 "Verhoging"
@@ -20350,9 +21170,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 "Verlicht"
@@ -20362,5 +21182,5 @@
 #: build/trans_presets.java:128
 msgid "Motorway Link"
-msgstr "Autosnelwegverbinding"
+msgstr "Af-/Oprit autosnelweg"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
@@ -20369,5 +21189,5 @@
 #: build/trans_presets.java:131
 msgid "Edit Motorway Link"
-msgstr "Een autosnelwegverbinding bewerken"
+msgstr "Een af-/oprit autosnelweg bewerken"
 
 #. </optional>
@@ -20397,5 +21217,5 @@
 #: build/trans_presets.java:167
 msgid "Trunk Link"
-msgstr "Autowegverbinding"
+msgstr "Af-/Oprit autoweg"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
@@ -20404,5 +21224,5 @@
 #: build/trans_presets.java:170
 msgid "Edit Trunk Link"
-msgstr "Een autowegverbinding bewerken"
+msgstr "Een af-/oprit autoweg bewerken"
 
 #. </optional>
@@ -20415,5 +21235,5 @@
 #: build/trans_presets.java:188 build/trans_surveyor.java:76
 msgid "Primary"
-msgstr "Provinciale hoofdweg"
+msgstr "Provinciale weg"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
@@ -20422,5 +21242,5 @@
 #: build/trans_presets.java:191
 msgid "Edit Primary Road"
-msgstr "Een S-weg bewerken"
+msgstr "Een Provinciale weg bewerken"
 
 #. item "Highways/Streets/Primary" combo "Incline"
@@ -20438,4 +21258,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"
@@ -20453,8 +21274,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 "Helling"
@@ -20474,4 +21296,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
@@ -20489,10 +21312,11 @@
 #: 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 ""
+msgstr "10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20510,4 +21334,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
@@ -20525,10 +21350,11 @@
 #: 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 ""
+msgstr "-10%"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20546,4 +21372,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
@@ -20561,10 +21388,11 @@
 #: 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 ""
+msgstr "10°"
 
 #. item "Highways/Streets/Primary" combo "Incline" display value
@@ -20582,4 +21410,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
@@ -20597,10 +21426,11 @@
 #: 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 ""
+msgstr "-10°"
 
 #. </optional>
@@ -20608,5 +21438,5 @@
 #: build/trans_presets.java:210
 msgid "Primary Link"
-msgstr "S-wegverbinding"
+msgstr "Af-/Oprit provinciale weg"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary_link" />
@@ -20614,5 +21444,5 @@
 #: build/trans_presets.java:212
 msgid "Edit Primary Link"
-msgstr "Een S-wegverbinding bewerken"
+msgstr "Een Af-/Oprit provinciale weg bewerken"
 
 #. </optional>
@@ -20624,5 +21454,5 @@
 #: build/trans_presets.java:229 build/trans_surveyor.java:80
 msgid "Secondary"
-msgstr "N-weg>400"
+msgstr "N-weg > 400"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
@@ -20632,5 +21462,5 @@
 #: build/trans_presets.java:233
 msgid "Edit Secondary Road"
-msgstr "Een provinciale weg bewerken"
+msgstr "Een N-weg bewerken"
 
 #. </optional>
@@ -20638,5 +21468,5 @@
 #: build/trans_presets.java:251
 msgid "Tertiary"
-msgstr "Tweebaansweg"
+msgstr "Tertiaire weg"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
@@ -20646,5 +21476,5 @@
 #: build/trans_presets.java:255
 msgid "Edit Tertiary Road"
-msgstr "Een tweebaansweg bewerken"
+msgstr "Een tertiaire weg bewerken"
 
 #. </optional>
@@ -20656,5 +21486,5 @@
 #: build/trans_presets.java:273 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr "Ongeklassificeerd"
+msgstr "Niet geclassificeerd"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
@@ -20664,5 +21494,5 @@
 #: build/trans_presets.java:277
 msgid "Edit Unclassified Road"
-msgstr "Een enkelbaansweg bewerken"
+msgstr "Een niet geclassificeerde weg bewerken"
 
 #. item "Highways/Streets/Unclassified" check "Passing Places"
@@ -20671,7 +21501,7 @@
 #. 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 "Uitwijkplaats"
+msgstr "Passeerstroken"
 
 #. item "Highways/Streets/Unclassified" text "Width (meters)"
@@ -20701,10 +21531,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 "Breedte (meters)"
@@ -20718,5 +21548,5 @@
 #: build/trans_presets.java:296 build/trans_surveyor.java:88
 msgid "Residential"
-msgstr "Woongebied"
+msgstr "Straat"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
@@ -20746,9 +21576,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 "Oppervlakte"
@@ -20773,9 +21603,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 "verhard"
@@ -20799,9 +21629,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 "onverhard"
@@ -20825,9 +21655,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 "asfalt"
@@ -20852,9 +21682,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 "beton"
@@ -20879,9 +21709,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 "metaal"
@@ -20901,4 +21731,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
@@ -20907,12 +21738,12 @@
 #: 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 "oerbos"
+msgstr "hout"
 
 #. item "Highways/Streets/Residential" combo "Surface" display value
@@ -20934,11 +21765,11 @@
 #: 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 "klinkers"
+msgstr "stoeptegels"
 
 #. item "Highways/Streets/Residential" combo "Surface" display value
@@ -20961,9 +21792,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 "kinderhoofdjes"
@@ -20988,11 +21819,11 @@
 #: 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 "gravel"
+msgstr "steenslag"
 
 #. item "Highways/Streets/Residential" combo "Surface" display value
@@ -21014,11 +21845,11 @@
 #: 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 "kiezelsteen"
+msgstr "grind"
 
 #. item "Highways/Streets/Residential" combo "Surface" display value
@@ -21040,9 +21871,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 "aangestampt"
@@ -21066,11 +21897,11 @@
 #: 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 "grasdal"
+msgstr "open stenen met gras"
 
 #. item "Highways/Streets/Residential" combo "Surface" display value
@@ -21093,9 +21924,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 "gras"
@@ -21120,9 +21951,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 "zand"
@@ -21148,12 +21979,12 @@
 #: 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 "gebied"
+msgstr "grond"
 
 #. </optional>
@@ -21174,5 +22005,5 @@
 #: build/trans_presets.java:338
 msgid "Pedestrian"
-msgstr "Voetgangers"
+msgstr "Voetgangersgebied"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
@@ -21181,5 +22012,5 @@
 #: build/trans_presets.java:341
 msgid "Edit Pedestrian Street"
-msgstr "Voetgangerszone bewerken"
+msgstr "Voetgangersgebied bewerken"
 
 #. </optional>
@@ -21202,10 +22033,10 @@
 #: build/trans_presets.java:365
 msgid "Serviceway type"
-msgstr "Dienstwegtype"
+msgstr "Type dienstweg"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
 #: build/trans_presets.java:365
 msgid "alley"
-msgstr "steeg"
+msgstr "brandgang"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
@@ -21217,5 +22048,5 @@
 #: build/trans_presets.java:365
 msgid "parking_aisle"
-msgstr "parkeergang"
+msgstr "Weg op parkeerplaats"
 
 #. </optional>
@@ -21223,5 +22054,5 @@
 #: build/trans_presets.java:381
 msgid "Parking Aisle"
-msgstr "Parkeergang"
+msgstr "Weg op parkeerplaats"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
@@ -21231,5 +22062,5 @@
 #: build/trans_presets.java:385
 msgid "Edit Parking Aisle"
-msgstr "Een parkeergang bewerken"
+msgstr "Een weg op parkeerplaats bewerken"
 
 #. </optional>
@@ -21237,5 +22068,5 @@
 #: build/trans_presets.java:395
 msgid "Road (Unknown Type)"
-msgstr "Weg (onbekend soort)"
+msgstr "Weg (onbekend type)"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
@@ -21244,5 +22075,5 @@
 #: build/trans_presets.java:398
 msgid "Edit Road of unknown type"
-msgstr "Een weg van onbekend soort bewerken"
+msgstr "Een weg van onbekend type bewerken"
 
 #. </optional>
@@ -21250,15 +22081,15 @@
 #: build/trans_presets.java:416
 msgid "Construction"
-msgstr "Werkzaamheden"
+msgstr "Weg in aanleg"
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
 #: build/trans_presets.java:417
 msgid "Edit Highway Under Construction"
-msgstr "Een autosnelweg met werkzaamheden bewerken"
+msgstr "Een weg in aanleg bewerken"
 
 #. item "Highways/Streets/Construction" combo "Junction"
 #: build/trans_presets.java:432
 msgid "Junction"
-msgstr "Splitsing"
+msgstr "Afrit"
 
 #. item "Highways/Streets/Construction" combo "Junction" display value
@@ -21302,5 +22133,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 "rotonde"
@@ -21309,5 +22140,5 @@
 #: build/trans_presets.java:432
 msgid "jughandle"
-msgstr ""
+msgstr "afrit"
 
 #. item "Highways/Streets/Construction" combo "Junction" display value
@@ -21454,64 +22285,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
@@ -21546,10 +22377,10 @@
 #: build/trans_presets.java:446
 msgid "Transport mode restrictions"
-msgstr ""
+msgstr "Toegangsbeperkingen"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access"
 #: build/trans_presets.java:447
 msgid "General Access"
-msgstr ""
+msgstr "Algemene toegang"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access" display value
@@ -21587,11 +22418,11 @@
 #: 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"
-msgstr "bestemming"
+msgstr "bestemmingsverkeer"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access" display value
@@ -21618,10 +22449,10 @@
 #: 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 "levering"
+msgstr "afleveren goederen"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access" display value
@@ -21669,12 +22500,12 @@
 #: 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"
-msgstr "toestemming"
+msgstr "met vergunning"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access" display value
@@ -21714,9 +22545,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"
@@ -21737,9 +22568,9 @@
 #: 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 "landbouw"
+msgstr "landbouwverkeer"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access" display value
@@ -21757,9 +22588,9 @@
 #: 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 "bos"
+msgstr "verkeer bosbouw"
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access" display value
@@ -21897,61 +22728,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
@@ -21985,10 +22816,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 "officieel"
@@ -22020,10 +22851,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 "bestemmingsverkeer"
@@ -22042,11 +22873,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 "Ruiters"
@@ -22055,16 +22886,16 @@
 #: build/trans_presets.java:450
 msgid "Vehicles per type"
-msgstr ""
+msgstr "Voertuigen per type"
 
 #. item "Highways/Streets/Road Restrictions" combo "All vehicles"
 #: build/trans_presets.java:451
 msgid "All vehicles"
-msgstr ""
+msgstr "Alle voertuigen"
 
 #. 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 ""
+msgstr "Motorvoertuigen"
 
 #. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
@@ -22083,12 +22914,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 "Motorfiets"
@@ -22106,17 +22937,17 @@
 #. 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 "Gemotoriseerd verkeer"
+msgstr "Vierwielige motorvoertuigen"
 
 #. item "Highways/Streets/Road Restrictions" combo "Light Commercial Vehicles (goods)"
 #: build/trans_presets.java:456
 msgid "Light Commercial Vehicles (goods)"
-msgstr ""
+msgstr "Licht vrachtverkeer (goederenverkeer)"
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
@@ -22128,5 +22959,5 @@
 #: build/trans_presets.java:458
 msgid "Vehicles per use"
-msgstr ""
+msgstr "Voertuigen naar gebruik"
 
 #. item "Highways/Streets/Road Restrictions" combo "Agricultural"
@@ -22138,10 +22969,10 @@
 #: build/trans_presets.java:460
 msgid "Emergency vehicles"
-msgstr ""
+msgstr "Noodhulp"
 
 #. item "Highways/Streets/Road Restrictions" combo "High-occupancy vehicles (hov)"
 #: build/trans_presets.java:461
 msgid "High-occupancy vehicles (hov)"
-msgstr ""
+msgstr "Spitsstrook"
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
@@ -22159,25 +22990,25 @@
 #: build/trans_presets.java:465 build/trans_presets.java:506
 msgid "Max. weight (tonnes)"
-msgstr "Max. gewicht (tonnen)"
+msgstr "Max. gewicht (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:466
 msgid "Max. axleload (tonnes)"
-msgstr "Max. Asgewicht (ton)"
+msgstr "Max. asdruk (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. height (meters)"
 #: build/trans_presets.java:467
 msgid "Max. height (meters)"
-msgstr ""
+msgstr "Max. hoogte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. width (meters)"
 #: build/trans_presets.java:468
 msgid "Max. width (meters)"
-msgstr ""
+msgstr "Max. breedte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. length (meters)"
 #: build/trans_presets.java:469
 msgid "Max. length (meters)"
-msgstr ""
+msgstr "Max. lengte (meters)"
 
 #. <separator/>
@@ -22194,5 +23025,5 @@
 #: build/trans_presets.java:477
 msgid "Edit Junction"
-msgstr "Een splitsing bewerken"
+msgstr "Een afrit bewerken"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
@@ -22209,6 +23040,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 "Autosnelweg"
@@ -22216,5 +23047,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 "op- en afrit autosnelweg"
@@ -22234,6 +23065,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 "autoweg"
@@ -22241,5 +23072,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 "op- en afrit autoweg"
@@ -22259,6 +23090,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 "provinciale weg"
@@ -22266,5 +23097,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 "op- en afrit provinciale weg"
@@ -22284,6 +23115,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 "N-weg"
@@ -22303,6 +23134,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 "weg buiten bebouwde kom"
@@ -22310,7 +23141,7 @@
 #. 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 "niet geklassificeerd"
+msgstr "niet geclassificeerd"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
@@ -22322,6 +23153,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 "woongebied"
@@ -22329,5 +23160,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 "woonerf"
@@ -22368,6 +23199,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 "toegangsweg"
@@ -22375,5 +23206,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 "busbaan"
@@ -22398,9 +23229,9 @@
 #. <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 "werkzaamheden"
+msgstr "weg in aanleg"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
@@ -22421,5 +23252,5 @@
 #: build/trans_presets.java:501
 msgid "swing"
-msgstr ""
+msgstr "hangbrug"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
@@ -22434,48 +23265,59 @@
 
 #. </optional>
+#. item "Highways/Streets/Ford"
+#: build/trans_presets.java:526
+msgid "Ford"
+msgstr "Doorwaadplek"
+
+#. item "Highways/Streets/Ford" label "Edit Ford"
+#: build/trans_presets.java:527
+msgid "Edit Ford"
+msgstr "Doorwaadplek bewerken"
+
+#. </optional>
 #. group "Ways"
-#: build/trans_presets.java:527
+#: build/trans_presets.java:537
 msgid "Ways"
 msgstr "Wegen"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:528
+#: build/trans_presets.java:538
 msgid "Track"
-msgstr "Track"
+msgstr "Spoor"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. 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 "Track bewerken"
+msgstr "Spoor bewerken"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "Tracktype"
-msgstr "Spoortype"
+msgstr "Type spoor"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade1"
 msgstr "graad 1"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade2"
 msgstr "graad 2"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade3"
 msgstr "graad 3"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade4"
 msgstr "graad 4"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:536
+#: build/trans_presets.java:546
 msgid "grade5"
 msgstr "graad 5"
@@ -22483,16 +23325,16 @@
 #. 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 schaal"
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:546
+#: build/trans_presets.java:556
 msgid "General access"
-msgstr ""
+msgstr "Algemene toegang"
 
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:554
+#: build/trans_presets.java:564
 msgid "Path"
 msgstr "Pad"
@@ -22501,57 +23343,61 @@
 #. 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 "Pad bewerken"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "SAC Scale"
 msgstr "SAC schaal"
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T1 - hiking trail"
-msgstr ""
+msgstr "T1 - wandelroute"
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:562
+#: build/trans_presets.java:572
 msgid "T2 - mountain hiking trail"
-msgstr ""
+msgstr "T2 - wandelroute berg"
 
 #. 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 ""
+msgstr "T3 - moeilijk, wandelroute blootgesteld"
 
 #. 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 ""
+msgstr "T4 - moeilijk, blootgesteld, steile wandelroute berg"
 
 #. 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 ""
+msgstr "T5 - moeilijke wandelroute berg met klimmen"
 
 #. 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 ""
+msgstr "T6 - gevaarlijke wandelroute berg met klimmen"
 
 #. 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 ""
+"Route goed vrijgemaakt. gebied vlak of licht hellend, geen gevaar om te "
+"vallen"
 
 #. 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, "
 "fall hazard possible"
 msgstr ""
+"Route met doorlopende gebalanceerde stijging. Terrein gedeeltelijk steil, "
+"mogelijk gevaar om te vallen"
 
 #. 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 "
@@ -22559,40 +23405,49 @@
 "jagged rocks"
 msgstr ""
+"blootgestelde delen kunnen beveiligd zijn met touwen of kettingen, mogelijk "
+"nodig om handen te moeten gebruiken voor balans. Gedeeltelijk blootgestelde "
+"delen met gevaar om te vallen, losse stenen, onbetreden - scherpe stenen"
 
 #. 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 "
 "grassy acclivities, jagged rocks, facile snow-free glaciers."
 msgstr ""
+"soms handen nodig om vooruit te komen. Terrein bekoorlijk blootgesteld, "
+"bijzonder grassige hellingen, makkelijke sneeuwvrije gletsjers."
 
 #. 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, "
 "jagged rocks, few dangerous glacier and snow"
 msgstr ""
+"enkel simpel opklimmend naar de tweede graad. Blootgesteld, moeilijk "
+"terrein, scherpe stenen, enkele gevaarlijke gletsjers en sneeuw"
 
 #. 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, "
 "glacier with danger to slip and fall"
 msgstr ""
+"opklimmend naar tweede graad. Vaak erg blootgesteld, bijzonder scherpe "
+"stenen, gletsjer met gevaar om uit te glijden en te vallen"
 
 #. 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"
-msgstr ""
+msgstr "Zichtbaarheid"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "excellent"
 msgstr "uitstekend"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "good"
 msgstr "goed"
@@ -22600,15 +23455,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 "gemiddeld"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "bad"
 msgstr "slecht"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:571
+#: build/trans_presets.java:581
 msgid "horrible"
 msgstr "verschrikkelijk"
@@ -22631,23 +23486,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 "Rolstoelen"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:582
+#: build/trans_presets.java:592
 msgid "Ski"
 msgstr "Ski"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:583
+#: build/trans_presets.java:593
 msgid "Snowmobile"
 msgstr "Sneeuwscooter"
@@ -22656,11 +23511,11 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:592
+#: build/trans_presets.java:602
 msgid "Dedicated Bridleway"
-msgstr "Voorbestemd Ruiterpad"
+msgstr "Voorbestemd ruiterpad"
 
 #. <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 "Ruiterpad bewerken"
@@ -22668,26 +23523,26 @@
 #. </optional>
 #. item "Ways/Cycle Lane"
-#: build/trans_presets.java:612
+#: build/trans_presets.java:622
 msgid "Cycle Lane"
-msgstr ""
+msgstr "Fietsstrook"
 
 #. <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 ""
+msgstr "Fietsstrook bewerken"
 
 #. item "Ways/Cycle Lane" combo "Cycleway"
-#: build/trans_presets.java:615
+#: build/trans_presets.java:625
 msgid "Cycleway"
-msgstr ""
+msgstr "Fietspad"
 
 #. item "Ways/Cycle Lane" combo "Cycleway" display value
 #. 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 ""
+msgstr "fietsstrook"
 
 #. item "Ways/Cycle Lane" combo "Cycleway" display value
@@ -22736,59 +23591,59 @@
 #. 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 ""
+msgstr "baan"
 
 #. item "Ways/Cycle Lane" combo "Cycleway" display value
 #. 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 ""
+msgstr "tweerichtingsverkeer"
 
 #. item "Ways/Cycle Lane" combo "Cycleway" display value
 #. 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 ""
+msgstr "tweerichtingsverkeer"
 
 #. item "Ways/Cycle Lane" combo "Cycleway" display value
 #. 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 ""
+msgstr "twee richtingen"
 
 #. item "Ways/Cycle Lane" combo "Cycleway" display value
 #. 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 ""
@@ -22797,39 +23652,39 @@
 #. 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 ""
+msgstr "Fietspad links"
 
 #. item "Ways/Cycle Lane" combo "Cycleway right"
-#: build/trans_presets.java:617
+#: build/trans_presets.java:627
 msgid "Cycleway right"
-msgstr ""
+msgstr "Fietspad rechts"
 
 #. item "Ways/Cycle Lane" check "Oneway (bicycle)"
-#: build/trans_presets.java:618
+#: build/trans_presets.java:628
 msgid "Oneway (bicycle)"
-msgstr ""
+msgstr "Eénrichting (fiets)"
 
 #. <space />
 #. item "Ways/Cycle Lane" label "Edit Highway"
-#: build/trans_presets.java:620
+#: build/trans_presets.java:630
 msgid "Edit Highway"
-msgstr ""
+msgstr "Highway bewerken"
 
 #. item "Ways/Cycle Lane" combo "Highway"
-#: build/trans_presets.java:621
+#: build/trans_presets.java:631
 msgid "Highway"
-msgstr ""
+msgstr "Highway"
 
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:624
+#: build/trans_presets.java:634
 msgid "Dedicated Cycleway"
-msgstr "Voorbestemd Fietspad"
+msgstr "Voorbestemd fietspad"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
@@ -22845,11 +23700,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 "Fietspad bewerken"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:640
+#: build/trans_presets.java:650
 msgid "Pedestrians"
 msgstr "Voetgangers"
@@ -22857,24 +23712,24 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:646
+#: build/trans_presets.java:656
 msgid "Segregated Foot- and Cycleway"
-msgstr "Gescheiden Voet- en Fietspad"
+msgstr "Gescheiden voet- en fietspad"
 
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:670
+#: build/trans_presets.java:680
 msgid "Combined Foot- and Cycleway"
-msgstr "Gekombineerd Voet- en Fietspad"
+msgstr "Gecombineerd voet- en fietspad"
 
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:695
+#: build/trans_presets.java:705
 msgid "Dedicated Footway"
-msgstr "Voorbestemd Voetpad"
+msgstr "Voorbestemd voetpad"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. 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 "Voetpad bewerken"
@@ -22882,5 +23737,5 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:715
+#: build/trans_presets.java:725
 msgid "Steps"
 msgstr "Trap"
@@ -22890,33 +23745,33 @@
 #. 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 "Trap bewerken"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:733
+#: build/trans_presets.java:743
 msgid "Amount of Steps"
-msgstr "Aantal trappen"
+msgstr "Aantal treden"
 
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:737
+#: build/trans_presets.java:747
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
-msgstr "Waypoints"
+msgstr "Wegpunten"
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:738
+#: build/trans_presets.java:748
 msgid "Motorway Junction"
-msgstr "Snelwegkruising"
+msgstr "Afslag op autosnelweg"
 
 #. <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 "Snelwegkruising bewerken"
+msgstr "Afslag op autosnelweg bewerken"
 
 #. 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
@@ -22925,10 +23780,10 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:745
+#: build/trans_presets.java:755
 msgid "Exit to"
-msgstr ""
+msgstr "Afrit naar"
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:747
+#: build/trans_presets.java:757
 msgid "Services"
 msgstr "Diensten"
@@ -22936,5 +23791,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 "Rustplaats bewerken"
@@ -23028,42 +23883,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 "Bedrijf"
@@ -23072,6 +23927,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 "Toiletten"
@@ -23079,5 +23934,5 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:768
 msgid "Rest Area"
 msgstr "Rustplaats"
@@ -23085,11 +23940,11 @@
 #. <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 "Wijzig Rustplaats"
+msgstr "Bewerken rustplaats"
 
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:778
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -23099,5 +23954,5 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:773
+#: build/trans_presets.java:783
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -23107,13 +23962,13 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:787
 msgid "Pedestrian crossing type"
-msgstr "Soort voetgangersoversteekplaats"
+msgstr "Type voetgangersoversteekplaats"
 
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" display value
 #. 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 "zonder verkeerslichten"
@@ -23122,6 +23977,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 "verkeerslichten"
@@ -23130,6 +23985,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 "eiland"
@@ -23138,14 +23993,14 @@
 #. 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 "ongemarkeerd"
+msgstr "niet gemarkeerd"
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. 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 "Als ruiter oversteken"
@@ -23154,6 +24009,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 "Op de fiets oversteken"
@@ -23162,17 +24017,17 @@
 #. 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 "Klaar-over"
 
 #. 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 ""
+msgstr "Type naam oversteekplaats (UK)"
 
 #. 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"
@@ -23180,35 +24035,35 @@
 #. 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 "pelicaan"
+msgstr "pelican"
 
 #. 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 ""
+msgstr "toucan"
 
 #. 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 ""
+msgstr "puffin"
 
 #. 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 ""
+msgstr "pegasus"
 
 #. 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 ""
+msgstr "tiger"
 
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:784
+#: build/trans_presets.java:794
 msgid "Stop"
 msgstr "Stop"
@@ -23216,5 +24071,5 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:797
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -23225,15 +24080,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 "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:792
+#: build/trans_presets.java:802
 msgid "clockwise"
 msgstr "met de klok mee"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:804
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -23242,15 +24097,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 "Wijzig Oversteekplaats"
+msgstr "Bewerken oversteekplaats"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:803
+#: build/trans_presets.java:813
 msgid "Type name (UK)"
-msgstr ""
+msgstr "Type naam (UK)"
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:815
 msgid "Traffic Calming"
 msgstr "Verkeersremmers"
@@ -23258,52 +24113,52 @@
 #. <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 "Wijzig verkeersremmers"
+msgstr "Verkeersremmers bewerken"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "bump"
 msgstr "ribbel"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "chicane"
 msgstr "asverschuiving"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "choker"
 msgstr "versmalling"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "cushion"
 msgstr "Verkeerskussen"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "hump"
 msgstr "verkeersdrempel"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:808
+#: build/trans_presets.java:818
 msgid "table"
 msgstr "verkeersplateau"
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:810
+#: build/trans_presets.java:820
 msgid "Passing Place"
-msgstr "Uitwijkplaats"
+msgstr "Passeerstrook"
 
 #. <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 "Wijzig Uitwijkplaats"
+msgstr "Passeerstrook bewerken"
 
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:825
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -23313,5 +24168,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 "Stadsgrens"
@@ -23319,15 +24174,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 "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:827
+#: build/trans_presets.java:837
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:829
+#: build/trans_presets.java:839
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
@@ -23337,24 +24192,13 @@
 #. <separator/>
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:834
+#: build/trans_presets.java:844
 msgid "Grit Bin"
-msgstr "Strooigoedbak"
+msgstr "Strooibak"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#. item "Waypoints/Ford"
-#: build/trans_presets.java:839
-msgid "Ford"
-msgstr "Doorwaadplek"
-
-#. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:840
-msgid "Edit Ford"
-msgstr "Doorwaadplek bewerken"
-
-#. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:849
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -23362,5 +24206,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 "Bergpas bewerken"
@@ -23372,7 +24216,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 "Stijging"
@@ -23407,18 +24251,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 "Wikipedia"
@@ -23426,5 +24270,5 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:859
+#: build/trans_presets.java:861
 msgid "Barriers"
 msgstr "Barrières"
@@ -23432,5 +24276,5 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:864
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -23438,5 +24282,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 "Verkeerspaal bewerken"
@@ -23486,27 +24330,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 "Toegestaan verkeer:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:876
 msgid "Cycle Barrier"
-msgstr "Fietsversperring"
+msgstr "Fietshekje"
 
 #. item "Barriers/Block"
-#: build/trans_presets.java:884
+#: build/trans_presets.java:886
 msgid "Block"
 msgstr "Blok"
 
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:893
+#: build/trans_presets.java:895
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -23514,10 +24358,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 "Wildrooster bewerken"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:907
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -23525,15 +24369,15 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:908
+#: build/trans_presets.java:910
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:909
+#: build/trans_presets.java:911
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:922
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -23541,5 +24385,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 "Tolpoort bewerken"
@@ -23547,10 +24391,10 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:930
+#: build/trans_presets.java:932
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:931
+#: build/trans_presets.java:933
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -23559,5 +24403,5 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:947
 msgid "Hedge"
 msgstr "Haag"
@@ -23566,24 +24410,43 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Fence"
 msgstr "Hek"
 
-#. <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 "elektrisch"
+
+#. 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 "paal"
+
+#. 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 "Muur"
@@ -23591,5 +24454,5 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:961
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -23598,7 +24461,7 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:965
 msgid "Retaining Wall"
-msgstr "Stutmuur"
+msgstr "Keermuur"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
@@ -23607,94 +24470,94 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
+#: build/trans_presets.java:972
+msgid "Entrance"
+msgstr "Doorgang"
+
+#. item "Barriers/Entrance" label "Edit Entrance"
 #: build/trans_presets.java:973
-msgid "Entrance"
-msgstr "Ingang"
-
-#. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:974
 msgid "Edit Entrance"
-msgstr "Ingang bewerken"
+msgstr "Doorgang bewerken"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:985
+#: build/trans_presets.java:984
 msgid "Gate"
-msgstr "Poort"
+msgstr "Gate"
 
 #. <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 "Poort bewerken"
+msgstr "Hek bewerken"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:997
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:998
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:1010
+#: build/trans_presets.java:1009
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1010
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Bump Gate"
+#: build/trans_presets.java:1021
+msgid "Bump Gate"
+msgstr "Botshek"
+
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
 #: build/trans_presets.java:1022
-msgid "Bump Gate"
-msgstr "Botspoort"
-
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:1023
 msgid "Edit Bump Gate"
-msgstr "Botspoort bewerken"
+msgstr "Botshek bewerken"
 
 #. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:1033
+msgid "Kissing Gate"
+msgstr "Voetgangershek"
+
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
 #: build/trans_presets.java:1034
-msgid "Kissing Gate"
-msgstr "Sluipdoorhek"
-
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:1035
 msgid "Edit Kissing Gate"
-msgstr "Sluipdoorhek bewerken"
+msgstr "Voetgangershek bewerken"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1042
 msgid "Stile"
-msgstr "Overstap"
+msgstr "Overstaphek"
 
 #. <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 "Overstap bewerken"
+msgstr "Overstaphek bewerken"
 
 #. item "Barriers/Turnstile"
+#: build/trans_presets.java:1052
+msgid "Turnstile"
+msgstr "Draaipoortje"
+
+#. item "Barriers/Turnstile" label "Edit Turnstile"
 #: build/trans_presets.java:1053
-msgid "Turnstile"
-msgstr "Draaipoort"
-
-#. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1054
 msgid "Edit Turnstile"
-msgstr "Wijzig Draaipoort"
+msgstr "Draaipoortje bewerken"
 
 #. item "Barriers/Sally Port"
+#: build/trans_presets.java:1061
+msgid "Sally Port"
+msgstr "Stadspoort"
+
+#. item "Barriers/Sally Port" label "Edit Sally Port"
 #: build/trans_presets.java:1062
-msgid "Sally Port"
-msgstr "Gekoppelde deuren"
-
-#. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1063
 msgid "Edit Sally Port"
-msgstr "Gekoppelde deuren bewerken"
+msgstr "Stadspoort bewerken"
 
 #. group "Water"
@@ -23702,6 +24565,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 "Water"
@@ -23709,16 +24572,16 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1079
 msgid "Drain"
-msgstr "Afvoer"
+msgstr "Greppel"
 
 #. <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 "Afvoer bewerken"
+msgstr "Greppel bewerken"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1087
 msgid "Ditch"
 msgstr "Gracht"
@@ -23726,10 +24589,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 "Wijzig gracht"
+msgstr "Gracht bewerken"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1095
 msgid "Stream"
 msgstr "Beek"
@@ -23737,10 +24600,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 "Wijzig Beek"
+msgstr "Beek bewerken"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1103
 msgid "Canal"
 msgstr "Kanaal"
@@ -23748,10 +24611,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 "Kanaal bewerken"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1112
 msgid "River"
 msgstr "Rivier"
@@ -23761,5 +24624,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 "Rivier bewerken"
@@ -23767,5 +24630,5 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1124
 msgid "Spring"
 msgstr "Bron"
@@ -23773,20 +24636,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 "Bron bewerken"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1131
+#: build/trans_presets.java:1130
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1131
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1137
 msgid "Weir"
 msgstr "Stuw"
@@ -23794,10 +24657,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 "Stuw bewerken"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1144
 msgid "Dam"
 msgstr "Dam"
@@ -23805,18 +24668,18 @@
 #. <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 "Dam bewerken"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1152
 msgid "Groyne"
-msgstr "Krib"
+msgstr "Strekdam"
 
 #. <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 "Wijzig Krib"
+msgstr "Strekdam bewerken"
 
 #. <space />
@@ -23824,15 +24687,15 @@
 #. <separator/>
 #. item "Water/Water/Basin"
+#: build/trans_presets.java:1159
+msgid "Basin"
+msgstr "Waterbekken"
+
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
 #: build/trans_presets.java:1160
-msgid "Basin"
-msgstr "Estuarium"
-
-#. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1161
 msgid "Edit Basin Landuse"
-msgstr "Estuarium bewerken"
+msgstr "Waterbekken bewerken"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1165
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -23840,15 +24703,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 "Reservoir bewerken"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1172
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1173
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -23856,20 +24719,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 "Water bewerken"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1184
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1185
 msgid "Edit Land"
 msgstr "Land bewerken"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1189
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -23877,25 +24740,25 @@
 #. <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 "Kustlijn bewerken"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1195
 msgid "Riverbank"
-msgstr "Rivierbank"
+msgstr "Rivieroever"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. 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 "Rivierbank bewerken"
+msgstr "Rivieroever bewerken"
 
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1203
 msgid "Wetland"
-msgstr "Drasland"
+msgstr "Waterrijk land"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
@@ -23904,15 +24767,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 "Drasland bewerken"
+msgstr "Waterrijk land bewerken"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "swamp"
 msgstr "Moeras"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "bog"
 msgstr "veen"
@@ -23925,40 +24788,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 "moeras"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "reedbed"
 msgstr "rietveld"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "tidalflat"
 msgstr "slik"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1211
 msgid "mangrove"
 msgstr "mangroven"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1213
 msgid "Mud"
 msgstr "Modder"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1214
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1218
 msgid "Beach"
 msgstr "Strand"
@@ -23966,20 +24829,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 "Strand bewerken"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1224
 msgid "Bay"
 msgstr "Baai"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1225
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1229
 msgid "Cliff"
 msgstr "Klif"
@@ -23987,15 +24850,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 "Klif bewerken"
 
 #. group "Shipping"
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1236
 msgid "Shipping"
 msgstr "Scheepvaart"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1237
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -24003,20 +24866,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 "Veerbootterminal bewerken"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "Cargo"
 msgstr "Lading"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers"
-msgstr "pasagiers"
+msgstr "passagiers"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "vehicle"
 msgstr "voertuigen"
@@ -24102,49 +24965,49 @@
 #. <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 "fiets"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "hgv"
 msgstr "zwaar vervoer"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1242
 msgid "passengers;vehicle"
 msgstr "pasagiers;voertuigen"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1244
 msgid "Ferry Route"
-msgstr "Veerpontroute"
+msgstr "Route veerpont"
 
 #. <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 "Veerpontroute bewerken"
+msgstr "Route veerpont bewerken"
 
 #. </optional>
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1254
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1255
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1259
 msgid "Pier"
 msgstr "Pier"
@@ -24152,19 +25015,19 @@
 #. <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 "Pier bewerken"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1265
 msgid "Lock Gate"
-msgstr "Sluis"
+msgstr "Sluisdeur"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1269
 msgid "Turning Point"
-msgstr "Zwaaiplaats"
+msgstr "Draaikom"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
@@ -24172,5 +25035,5 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1274
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -24180,10 +25043,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 "Trailerhelling bewerken"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1282
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -24191,31 +25054,31 @@
 #. <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 "Scheepswerf bewerken"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1289
 msgid "Dock"
-msgstr "Dok"
+msgstr "Droogdok"
 
 #. <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 "Dok bewerken"
+msgstr "Droogdok bewerken"
 
 #. group "Transport"
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1298
 msgid "Transport"
 msgstr "Vervoer"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1299
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1301
+#: build/trans_presets.java:1300
 msgid "Rail"
 msgstr "Spoor"
@@ -24223,5 +25086,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 "Spoor bewerken"
@@ -24251,9 +25114,9 @@
 #. <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 ""
+msgstr "Smalspoor (mm)"
 
 #. item "Transport/Railway/Rail" combo "Types"
@@ -24267,8 +25130,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 "Types"
@@ -24282,8 +25145,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 "tuin"
@@ -24297,10 +25160,10 @@
 #. 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 "nevenweg"
+msgstr "zijspoor"
 
 #. item "Transport/Railway/Rail" combo "Types" display value
@@ -24312,10 +25175,10 @@
 #. 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 "privéoprit"
+msgstr "wissels"
 
 #. item "Transport/Railway/Rail" combo "Electrified"
@@ -24326,8 +25189,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 "Elektrisch"
@@ -24340,10 +25203,10 @@
 #. 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 ""
+msgstr "bovenleiding"
 
 #. item "Transport/Railway/Rail" combo "Electrified" display value
@@ -24370,4 +25233,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
@@ -24402,12 +25272,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
@@ -24425,9 +25296,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 "Voltage"
@@ -24440,10 +25311,10 @@
 #. 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 "Frekwentie (Hz)"
+msgstr "Frequentie (Hz)"
 
 #. item "Transport/Railway/Rail" combo "Frequency (Hz)" display value
@@ -24454,8 +25325,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"
@@ -24463,10 +25334,10 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1313
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. 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 "Smalspoor bewerken"
@@ -24474,5 +25345,5 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1325
 msgid "Monorail"
 msgstr "Monorail"
@@ -24480,5 +25351,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 "Monorail bewerken"
@@ -24486,10 +25357,10 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1337
+msgid "Preserved"
+msgstr "Museumspoorweg"
+
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
 #: build/trans_presets.java:1338
-msgid "Preserved"
-msgstr "Museumspoor"
-
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1339
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
@@ -24497,10 +25368,10 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1349
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1350
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
@@ -24508,10 +25379,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 "Metro bewerken"
@@ -24519,10 +25390,10 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1373
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1374
 msgid "Edit Tram"
 msgstr "Tram bewerken"
@@ -24530,5 +25401,5 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1386
+#: build/trans_presets.java:1385
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -24536,5 +25407,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 "Busbaan bewerken"
@@ -24543,10 +25414,10 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1405
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1407
+#: build/trans_presets.java:1406
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
@@ -24555,17 +25426,17 @@
 #. <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 "Optionele soorten"
+msgstr "Optionele typen"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1411
 msgid "Abandoned Rail"
-msgstr "Verwijderd spoor"
+msgstr "Oud ongebruikt spoor"
 
 #. <key key="railway" value="abandoned" />
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1415
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -24574,7 +25445,7 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1419
 msgid "Crossing"
-msgstr "Onbewaakte spporwegovergang"
+msgstr "Onbewaakte spoorwegovergang"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
@@ -24582,5 +25453,5 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1423
 msgid "Crossing type"
 msgstr "Type oversteekplaats"
@@ -24588,5 +25459,5 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1429
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -24595,5 +25466,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 "Stootblok"
@@ -24602,10 +25473,10 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1439
+#: build/trans_presets.java:1438
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1439
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -24613,5 +25484,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 "Stoeltjeslift bewerken"
@@ -24633,12 +25504,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 "Referentienummer"
@@ -24664,16 +25535,16 @@
 #. <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 ""
+msgstr "Aantal mensen per uur"
 
 #. 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 ""
+msgstr "Aantal mensen per stoel"
 
 #. item "Aerialway/Chair Lift" text "Typical journey time in minutes"
@@ -24689,18 +25560,18 @@
 #. <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 ""
+msgstr "Normale reistijd in minuten"
 
 #. 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 ""
+msgstr "Heeft overkapping?"
 
 #. item "Aerialway/Chair Lift" check "Has heating?"
@@ -24708,12 +25579,12 @@
 #. 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 ""
+msgstr "Heeft verwarming?"
 
 #. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1453
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -24721,5 +25592,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 "Sleeplift bewerken"
@@ -24727,5 +25598,5 @@
 #. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1465
+#: build/trans_presets.java:1464
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -24733,110 +25604,110 @@
 #. <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 "Kabinebaan bewerken"
 
 #. 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 ""
+msgstr "Aantal mensen per cabine"
 
 #. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1477
 msgid "Gondola"
-msgstr ""
+msgstr "Gondelbaan"
 
 #. <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 ""
+msgstr "Gondelbaan bewerken"
 
 #. 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 ""
+msgstr "Aantal mensen per gondel"
 
 #. </optional>
 #. item "Aerialway/Mixed Lift"
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1490
 msgid "Mixed Lift"
-msgstr ""
+msgstr "Gemengde lift"
 
 #. <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 ""
+msgstr "Gemengde lift bewerken (bevat zowel gondels als stoelen)"
 
 #. 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 ""
+msgstr "Aantal mensen per gondel/stoel"
 
 #. </optional>
 #. item "Aerialway/T-bar Lift"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1504
 msgid "T-bar Lift"
-msgstr ""
+msgstr "Skilift"
 
 #. <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 ""
+msgstr "Skilift bewerken"
 
 #. </optional>
 #. item "Aerialway/J-bar Lift"
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1515
 msgid "J-bar Lift"
-msgstr ""
+msgstr "Sleeplift"
 
 #. <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 ""
+msgstr "Sleeplift bewerken"
 
 #. </optional>
 #. item "Aerialway/Platter Lift"
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1526
 msgid "Platter Lift"
-msgstr ""
+msgstr "Skilift"
 
 #. <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 ""
+msgstr "Skilift bewerken"
 
 #. </optional>
 #. item "Aerialway/Rope Tow"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1537
 msgid "Rope Tow"
-msgstr ""
+msgstr "Touwlift"
 
 #. <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 ""
+msgstr "Touwlift bewerken"
 
 #. </optional>
 #. item "Aerialway/Magic Carpet"
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1548
 msgid "Magic Carpet"
-msgstr ""
+msgstr "Vliegend tapijt"
 
 #. <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 ""
+msgstr "Vliegend tapijt bewerken"
 
 #. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1559
 msgctxt "aerialway"
 msgid "Goods"
@@ -24844,36 +25715,36 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1560
 msgctxt "aerialway"
 msgid "Edit Goods"
-msgstr "Wijzig Goederen"
+msgstr "Goederen bewerken"
 
 #. </optional>
 #. <separator/>
 #. item "Aerialway/Station"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1569
 msgctxt "aerialway"
 msgid "Station"
-msgstr ""
+msgstr "Station"
 
 #. <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"
-msgstr ""
+msgstr "Station bewerken"
 
 #. item "Aerialway/Pylon"
-#: build/trans_presets.java:1576
+#: build/trans_presets.java:1575
 msgctxt "aerialway"
 msgid "Pylon"
-msgstr ""
+msgstr "Kabelmast"
 
 #. <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"
-msgstr ""
+msgstr "Kabelmast bewerken"
 
 #. item "Car/Parking"
@@ -24888,6 +25759,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 "Parkeerplaats"
@@ -24896,5 +25767,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 "Parkeerplaats bewerken"
@@ -24902,5 +25773,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 "meerlaags"
@@ -24908,5 +25779,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 "oppervlak"
@@ -24914,12 +25785,12 @@
 #. 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 "ondergronds"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1592
 msgid "Park and Ride"
-msgstr "PR (Park en Ride)"
+msgstr "PR (Parkeer en Reis)"
 
 #. item "Car/Parking" combo "Fee"
@@ -24928,7 +25799,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 "Parkeergeld"
@@ -24936,25 +25807,25 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1595
 msgid "Capacity (overall)"
 msgstr "Plaatsen (totaal)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1596
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1597
 msgid "Spaces for Women"
 msgstr "Plaatsen voor vrouwen"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1598
 msgid "Spaces for Parents"
 msgstr "Plaatsen voor ouders"
 
 #. 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 "Zie de Wiki voor andere capacity:[types]=*."
@@ -24962,5 +25833,5 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1602
 msgid "Fuel"
 msgstr "Brandstof"
@@ -24970,5 +25841,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 "Brandstof bewerken"
@@ -24981,117 +25852,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 "Merk"
 
 #. 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 ""
+msgstr "Chevron"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Citgo"
-msgstr ""
+msgstr "Citgo"
 
 #. 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 ""
+msgstr "Exxon"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Gulf"
-msgstr ""
+msgstr "Gulf"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Mobil"
-msgstr ""
+msgstr "Mobil"
 
 #. 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 ""
+msgstr "Petro-Canada"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Pioneer"
-msgstr ""
+msgstr "Pioneer"
 
 #. 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 "Shell"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1608
 msgid "Sunoco"
-msgstr ""
+msgstr "Sunoco"
 
 #. 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 "Onafhankelijk"
@@ -25184,48 +26055,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 "Openingstijden"
@@ -25316,47 +26187,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"
@@ -25448,47 +26319,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 "Ma-Vr 08:30-20:00"
@@ -25558,126 +26429,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 "Di-Zo 08:00-15:00;Za 08:00-12:00"
 
 #. item "Car/Fuel" combo "With shop"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "With shop"
-msgstr "Met shop"
+msgstr "Met winkel"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "convenience"
 msgstr "voeding"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1613
 msgid "kiosk"
 msgstr "tijdschriften"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1614
 msgid "Fuel types:"
 msgstr "Brandstoffen"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1616
+#: build/trans_presets.java:1615
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1616
+msgid "Bio Diesel"
+msgstr "Biodiesel"
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
 #: build/trans_presets.java:1617
-msgid "Bio Diesel"
-msgstr "Bio Diesel"
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr "Diesel (Gas naar vloeibaar - ultimate diesel)"
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
 #: build/trans_presets.java:1618
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr "Diesel (Gas To Liquid - ultimate diesel)"
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1619
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel (rode, voor landbouw en machines)"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1619
 msgid "Octane 91"
 msgstr "91 Octaan"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1620
 msgid "Octane 95"
 msgstr "95 Octaan"
 
 #. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1621
+msgid "Octane 98"
+msgstr "98 Octaan"
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1622
-msgid "Octane 98"
-msgstr "98 Octane"
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1623
 msgid "Octane 100"
 msgstr "100 Octaan"
 
 #. 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 (10% Ethanol mix)"
 
 #. 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 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1625
+msgid "LPG (Liquefied petroleum gas)"
+msgstr "LPG (Vloeibaar petroleumgas)"
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1626
-msgid "LPG (Liquefied petroleum gas)"
-msgstr "LPG (Liquefied petroleum gas)"
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+msgid "CNG (Compressed Natural Gas)"
+msgstr "CNG (Samengedrukt aardgas)"
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1627
-msgid "CNG (Compressed Natural Gas)"
-msgstr "CNG (Samengedrukt Aardgas)"
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1628
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (tweetakt)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1628
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (tweetakt)"
@@ -25685,5 +26556,5 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1631
 msgid "Charging Station"
 msgstr "Oplaadstation"
@@ -25691,20 +26562,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 "Wijzig Oplaadstation (voor elektrische auto''s)"
+msgstr "Oplaadstation (voor elektrische auto's) bewerken"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1637
 msgid "Amperage"
 msgstr "Laadstroom"
 
 #. item "Car/Wash"
+#: build/trans_presets.java:1639
+msgid "Wash"
+msgstr "Autowasstraat"
+
+#. item "Car/Wash" label "Edit Car Wash"
 #: build/trans_presets.java:1640
-msgid "Wash"
-msgstr "Wasstraat"
-
-#. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1641
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
@@ -25712,5 +26583,5 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1648
 msgid "Car Dealer"
 msgstr "Autodealer"
@@ -25718,5 +26589,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 "Winkel met autoonderdelen bewerken"
@@ -25724,28 +26595,28 @@
 #. 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 "Garage"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1656
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1663
 msgid "Tyres"
 msgstr "Banden"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1664
 msgid "Edit Tyres"
-msgstr "Wijzig Banden"
+msgstr "Banden bewerken"
 
 #. 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 "wijzig Banden"
+msgstr "Contactgegevens:"
 
 #. item "Car/Tyres" text "Phone Number"
@@ -25787,15 +26658,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 "Telefoonnummer"
@@ -25820,14 +26691,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 "Faxnummer"
@@ -25855,15 +26726,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 "Website"
@@ -25888,16 +26759,16 @@
 #. 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 "Emailadres"
+msgstr "E-mailadres"
 
 #. <separator/>
@@ -25905,6 +26776,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 "Verhuur"
@@ -25913,60 +26784,60 @@
 #. 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 "Autoverhuur bewerken"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1687
 msgid "Sharing"
-msgstr "Autodelen"
+msgstr "Auto delen"
 
 #. <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 "Autodelen bewerken"
+msgstr "Auto delen bewerken"
 
 #. item "Car/Sharing" text "Capacity"
 #. 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 "Capaciteit"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1700
 msgid "Edit Motorcycle Parking"
-msgstr "Wijzig Motorfietsparking"
+msgstr "Parkeren motorfietsen bewerken"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1707
 msgid "Motorcycle Dealer"
-msgstr "Motorfietsen"
+msgstr "Dealer motorfietsen"
 
 #. <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 "Wijzig Motorfietsen"
+msgstr "Winkel motorfietsen bewerken"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1712
 msgid "independent"
 msgstr "Onafhankelijk"
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1715
 msgid "Services:"
 msgstr "Diensten:"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgid "Sale"
 msgstr "Verkoop"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "yes"
@@ -25974,5 +26845,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "brand"
@@ -25980,5 +26851,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "used"
@@ -25986,5 +26857,5 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1716
 msgctxt "motorcycle"
 msgid "no"
@@ -25995,6 +26866,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 "merk"
@@ -26002,35 +26873,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 "oldtimer"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "Safety inspection"
-msgstr "Keuring"
+msgstr "Veiligheidskeuring"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "DEKRA"
 msgstr "DEKRA"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "GTÜ"
 msgstr "GTÜ"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "MOT"
 msgstr "MOT"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1719
 msgid "TÜV"
 msgstr "TÜV"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1720
 msgid "Parts"
 msgstr "Onderdelen"
@@ -26040,6 +26911,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 "Kleding"
@@ -26047,64 +26918,111 @@
 #. <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 "Fietsenstalling bewerken"
 
+#. 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 "Overdekt"
+
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1740
 msgid "Bike Dealer"
-msgstr "Fietshandelaar"
+msgstr "Fietsenhandelaar"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. 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 "Fietswinkel bewerken"
+msgstr "Fietsenwinkel bewerken"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1746
 msgid "Bicycles are sold"
-msgstr ""
+msgstr "Verkoopt nieuwe fietsen"
 
 #. 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 ""
+msgstr "Verkoopt tweedehands fietsen"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1748
 msgid "Bicycles are repaired"
-msgstr ""
+msgstr "Repareert fietsen"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1749
 msgid "Bicycles are rented"
-msgstr ""
+msgstr "Verhuurt fietsen"
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1749
+#: build/trans_presets.java:1750
 msgid "Free bicycle pump"
-msgstr ""
+msgstr "Gratis fietspomp"
 
 #. 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 ""
+"Gereedschap om zelf te repareren (kan een coöperatie voor fietsers zijn)"
 
 #. 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 ""
+msgstr "Wassen van fietsen (tegen vergoeding)"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. 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 "Fietsenverhuur bewerken"
+msgstr "Fietsverhuur bewerken"
 
 #. 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"
@@ -26112,5 +27030,5 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1763
 msgctxt "railway"
 msgid "Station"
@@ -26120,17 +27038,17 @@
 #. 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"
-msgstr "Wijzig Station"
+msgstr "Station bewerken"
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1771
 msgid "UIC-Reference"
-msgstr "UIC-referentie"
+msgstr "UIC-referentie (vervallen)"
 
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1774
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -26138,5 +27056,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 "Onbemand station bewerken"
@@ -26144,5 +27062,5 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1783
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -26151,5 +27069,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 "Tramhalte bewerken"
@@ -26157,5 +27075,5 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1793
 msgid "Railway Platform"
 msgstr "Perron"
@@ -26164,5 +27082,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 "Perron bewerken"
@@ -26174,31 +27092,31 @@
 #. <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 "Referentie (tracknummer)"
+msgstr "Referentie (spoornummer)"
 
 #. item "Public Transport/Railway Platform" check "Area"
 #. 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 "Gebied"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1803
 msgid "Subway Entrance"
-msgstr "Metroingang"
+msgstr "In-/uitgang metro"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. 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 "Metroingang bewerken"
+msgstr "In-/uitgang metro bewerken"
 
 #. 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 "Rolstoel"
@@ -26207,5 +27125,5 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1816
 msgid "Bus Station"
 msgstr "Busstation"
@@ -26214,5 +27132,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 "Busstation bewerken"
@@ -26220,5 +27138,5 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1825
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -26228,5 +27146,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 "Bushalte bewerken"
@@ -26235,6 +27153,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
@@ -26246,32 +27164,32 @@
 #. <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 "Bank"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1836
 msgid "Tactile Paving"
-msgstr ""
+msgstr "Tactiele tegels"
 
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1840
 msgid "Bus Platform"
-msgstr "Busstation"
+msgstr "Busperron"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1841
 msgid "Edit Bus Platform"
-msgstr "Busplatform bewerken"
+msgstr "Busperron bewerken"
 
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1849
 msgid "Ticket Machine"
-msgstr "Vervoerbewijsautomaat"
+msgstr "Kaartjesautomaat"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1855
 msgid "Reference Number"
 msgstr "Referentienummer"
@@ -26280,6 +27198,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 "Munten"
@@ -26288,14 +27206,14 @@
 #. 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 "Briefgeld"
+msgstr "Bankbiljetten"
 
 #. item "Public Transport/Ticket Machine" check "Electronic purses and Charge cards"
 #. 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 "Chipknip"
@@ -26304,6 +27222,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 "Pinpas"
@@ -26312,6 +27230,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 "Creditkaart"
@@ -26319,10 +27237,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 "Klantenkaarten"
 
 #. item "Taxi"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1864
 msgid "Taxi"
 msgstr "Taxi"
@@ -26330,5 +27248,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 "Taxistandplaats bewerken"
@@ -26336,27 +27254,27 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1871
 msgid "Airport"
 msgstr "Luchthaven"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1872
 msgid "Airport Ground"
-msgstr ""
+msgstr "Gebied luchthaven"
 
 #. <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 ""
+msgstr "Gebied luchthaven bewerken"
 
 #. <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"
@@ -26365,5 +27283,5 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1884
 msgid "Runway"
 msgstr "Startbaan"
@@ -26371,31 +27289,31 @@
 #. <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 "Wijzig Startbaan"
+msgstr "Startbaan bewerken"
 
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1892
 msgid "Taxiway"
-msgstr ""
+msgstr "Taxibaan"
 
 #. <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 ""
+msgstr "Taxibaan bewerken"
 
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1900
 msgid "Helipad"
-msgstr ""
+msgstr "Heliplatform"
 
 #. <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 ""
+msgstr "Heliplatform bewerken"
 
 #. </optional>
@@ -26403,7 +27321,7 @@
 #. <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 ""
+msgstr "Parkeerplaats luchtvaartuig"
 
 #. <key key="aeroway" value="apron" />
@@ -26411,5 +27329,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"
@@ -26420,6 +27338,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 "Baken"
@@ -26429,5 +27347,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 "Windvaan"
@@ -26436,5 +27354,5 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1929
 msgid "Terminal"
 msgstr "Terminal"
@@ -26442,29 +27360,29 @@
 #. <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 "Wijzig Terminal"
+msgstr "Terminal bewerken"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1935
 msgctxt "airport"
 msgid "Gate"
-msgstr ""
+msgstr "Gate"
 
 #. <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 ""
+msgstr "Terminal gate bewerken"
 
 #. 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 ""
+msgstr "Faciliteiten"
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1944
 msgid "Accommodation"
-msgstr ""
+msgstr "Accommodatie"
 
 #. item "Facilities/Accommodation/Hotel"
@@ -26474,5 +27392,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"
@@ -26481,5 +27399,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 "Hotel bewerken"
@@ -26493,8 +27411,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 "Sterren"
@@ -26530,12 +27448,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 "Internettoegang"
@@ -26556,12 +27474,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 "wlan"
@@ -26582,14 +27500,14 @@
 #. 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 ""
+msgstr "bekabeld"
 
 #. item "Facilities/Accommodation/Hotel" combo "Internet access" display value
@@ -26614,12 +27532,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"
@@ -26640,14 +27558,14 @@
 #. 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 "Bedrag internet toegang"
+msgstr "Kosten internettoegang"
 
 #. item "Facilities/Accommodation/Hotel" combo "Smoking"
@@ -26668,12 +27586,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 "Roken"
@@ -26695,12 +27613,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 "toegewezen"
@@ -26722,14 +27640,14 @@
 #. 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 "apart"
+msgstr "gescheiden"
 
 #. item "Facilities/Accommodation/Hotel" combo "Smoking" display value
@@ -26749,17 +27667,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 "afgescheiden"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1964
 msgid "Motel"
 msgstr "Motel"
@@ -26767,47 +27685,47 @@
 #. <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 "Motel bewerken"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1982
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1983
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:1998
 msgid "Chalet"
-msgstr "Chalet"
+msgstr "Bungalowpark"
 
 #. <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 "Chalet bewerken"
+msgstr "Bungalowpark bewerken"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2015
 msgid "Hostel"
-msgstr "Hostel"
+msgstr "Jeugdherberg"
 
 #. <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 "Hostel bewerken"
+msgstr "Jeugdherberg bewerken"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2033
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2034
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
@@ -26815,41 +27733,41 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2051
 msgid "Caravan Site"
-msgstr "Caravanpark"
+msgstr "Caravanterrein"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2052
 msgid "Edit Caravan Site"
-msgstr "Caravanpark bewerken"
+msgstr "Caravanterrein bewerken"
 
 #. <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 "Aantal plaatsen"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "Requires a fee"
 msgstr "Tegen betaling"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2063
 msgid "interval"
 msgstr "interval"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2064
 msgid "Power supply"
-msgstr "Energieaansluiting"
+msgstr "Aansluiting energie"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2065
 msgid "Tents allowed"
-msgstr "Tenten toegelaten"
+msgstr "Tenten toegestaan"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2072
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -26857,10 +27775,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 "Kampeerterrein bewerken"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2090
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -26871,5 +27789,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 "Restaurant"
@@ -26877,5 +27795,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 "Restaurant bewerken"
@@ -26884,6 +27802,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 "Keuken"
@@ -26891,5 +27809,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 "Italiaanse keuken"
@@ -26897,5 +27815,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 "Chinese keuken"
@@ -26903,5 +27821,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"
@@ -26909,5 +27827,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 "hamburger"
@@ -26915,5 +27833,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 "Grieks"
@@ -26921,5 +27839,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 "Duits"
@@ -26927,5 +27845,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 "Indiaas"
@@ -26933,5 +27851,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 "lokaal"
@@ -26939,5 +27857,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"
@@ -26945,5 +27863,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 "Turks"
@@ -26951,5 +27869,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 "Oosters"
@@ -26957,5 +27875,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 "Thais"
@@ -26963,5 +27881,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 "Mexicaans"
@@ -26969,5 +27887,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 "Japans"
@@ -26975,11 +27893,11 @@
 #. 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 ""
+msgstr "Frans"
 
 #. 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"
@@ -26987,5 +27905,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"
@@ -26993,79 +27911,79 @@
 #. 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 "Microbrouwerij"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2112
 msgid "Fast Food"
-msgstr "Fast Food"
+msgstr "Fastfood"
 
 #. <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 "Fast-Food-restaurant bewerken"
+msgstr "Fastfood-restaurant bewerken"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "fish_and_chips"
 msgstr "vis_en_friet"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2118
 msgid "chicken"
 msgstr "kip"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2131
 msgid "Food Court"
-msgstr ""
+msgstr "Lopend buffet"
 
 #. <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 ""
+msgstr "Lopend buffet bewerken"
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2148
 msgid "Cafe"
-msgstr "Koffiehuis of Tearoom"
+msgstr "Koffie-/Theehuis"
 
 #. <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 "Koffiehuis of Tearoom bewerken"
+msgstr "Koffie-/Theehuis bewerken"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2154
 msgid "ice_cream"
-msgstr "ijsroom"
+msgstr "ijs"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2167
 msgid "Pub"
-msgstr "Kroeg, Café"
+msgstr "Café/Kroeg"
 
 #. <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 "Kroeg, Café bewerken"
+msgstr "Café/Kroeg bewerken"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2186
 msgid "Biergarten"
-msgstr "Biergarten"
+msgstr "Bierhuis"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2187
 msgid "Edit Biergarten"
-msgstr "Biergarten bewerken"
+msgstr "Bierhuis bewerken"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2202
 msgid "Bar"
 msgstr "Bar"
@@ -27073,10 +27991,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 "Wijzig Bar"
+msgstr "Bar bewerken"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2219
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -27084,25 +28002,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 "Nachtclub bewerken"
 
 #. group "Tourism"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2235
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2236
 msgid "Attraction"
-msgstr "Attractie"
+msgstr "Toeristische attractie"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2237
 msgid "Edit Attraction"
-msgstr "Attractie bewerken"
+msgstr "Toeristische attractie bewerken"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2242
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -27110,10 +28028,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 "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2247
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
@@ -27121,20 +28039,20 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2250
 msgid "Information Office"
 msgstr "Informatiekantoor"
 
 #. 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 "Detailgraad"
+msgstr "Detailniveau"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "topo"
 msgstr "topografisch"
@@ -27167,32 +28085,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 "straat"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2262
 msgid "scheme"
-msgstr "schematisch"
+msgstr "schema"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "Shown Area"
-msgstr "Getoond gebied"
+msgstr "Weergegeven gebied"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "site"
-msgstr "plaatselijk"
+msgstr "plaats"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "city"
 msgstr "stad"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2263
 msgid "region"
 msgstr "regio"
@@ -27201,6 +28119,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 "Uitgebreide beschrijving"
@@ -27210,11 +28128,11 @@
 #. <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 "Getoonde routes voor:"
+msgstr "Weergegeven routes voor:"
 
 #. 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 "Wandelen"
@@ -27223,6 +28141,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 "Fietsen"
@@ -27230,13 +28148,13 @@
 #. 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 "Mountainbike"
+msgstr "Mountainbiken"
 
 #. item "Tourism/Map" check "Skiing"
 #. 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 "Skiën"
@@ -27244,67 +28162,67 @@
 #. 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 "Fietsen"
+msgstr "Paardrijden"
 
 #. 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 "... andere"
+msgstr "... ander mogelijk vervoer"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2274
 msgid "Information Board"
 msgstr "Informatiebord"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "Board Content"
-msgstr "Bordinhoud"
+msgstr "Inhoud bord"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "notice"
 msgstr "aankondigingen"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "history"
 msgstr "geschiedenis"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "nature"
 msgstr "natuur"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "wildlife"
-msgstr "Wild"
+msgstr "dieren"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2279
 msgid "plants"
 msgstr "beplanting"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2282
 msgid "Guidepost"
-msgstr ""
+msgstr "Wegwijzer"
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2297
 msgid "Information Terminal"
-msgstr "Informatie Terminal"
+msgstr "Informatiekiosk"
 
 #. 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 "Uitgebreide beschrijving"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2307
 msgid "Audioguide"
 msgstr "Audiogids"
@@ -27312,25 +28230,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 "Audiogids via mobiele telefoon"
+msgstr "Audiogids via mobiele telefoon?"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2318
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2320
 msgid "Other Information Points"
 msgstr "Andere informatiepunten"
 
 #. group "Leisure"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2327
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2328
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -27339,10 +28257,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 "Bioscoop bewerken"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2335
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -27351,57 +28269,57 @@
 #. 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 "Dierentuin bewerken"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2344
 msgid "Dog Park"
-msgstr ""
+msgstr "Hondenuitlaatgebied"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
 #. 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 ""
+msgstr "Hondenuitlaatgebied bewerken"
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "Barrier"
-msgstr ""
+msgstr "Barrière"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "fence"
-msgstr "Afsluiting"
+msgstr "omheining"
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2351
 msgid "wall"
-msgstr ""
+msgstr "muur"
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2355
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2356
 msgid "Edit Theme Park"
-msgstr "Themapart bewerken"
+msgstr "Themapark bewerken"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2361
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2362
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2366
 msgid "Sauna"
 msgstr "Sauna"
@@ -27411,7 +28329,7 @@
 #. <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 "Wijzig Sauna"
+msgstr "Sauna bewerken"
 
 #. item "Leisure/Sauna" combo "Opening Hours" display value
@@ -27437,20 +28355,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 "Di-Zo 08:00-15:00; Za 08:00-12:00"
 
 #. item "Leisure/Sauna" combo "Access"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2376
 msgid "Access"
 msgstr "Toegang"
@@ -27458,5 +28376,5 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2379
 msgid "Playground"
 msgstr "Speelveld"
@@ -27464,42 +28382,37 @@
 #. <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 "Speelveld bewerken"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2385
 msgid "Picnic Site"
-msgstr "Picnicplek"
+msgstr "Picknickplaats"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2386
 msgid "Edit Picnic Site"
-msgstr "Picnicplek bewerken"
+msgstr "Picknickplaats bewerken"
 
 #. 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 "Vuurplaats"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2391
 msgid "Public Grill"
-msgstr "Openbare BBQ"
+msgstr "Openbare barbecue"
 
 #. <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 "Openbare BBQ bewerken"
-
-#. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2396
-msgid "Covered"
-msgstr "Overdekt"
+msgstr "Openbare barbecue bewerken"
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgctxt "grill"
 msgid "Fuel"
@@ -27507,30 +28420,25 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2398
 msgid "charcoal"
 msgstr "houtskool"
 
-#. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2397
-msgid "electric"
-msgstr "elektrisch"
-
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2400
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2401
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. group "Culture"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2406
 msgid "Culture"
-msgstr "Kultuur"
+msgstr "Cultuur"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2407
 msgid "Museum"
 msgstr "Museum"
@@ -27538,10 +28446,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 "Museum bewerken"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2415
 msgid "Theatre"
 msgstr "Theater"
@@ -27550,10 +28458,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 "Theater bewerken"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2422
 msgid "Library"
 msgstr "Bibliotheek"
@@ -27562,10 +28470,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 "Bibliotheek bewerken"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2430
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -27573,10 +28481,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 "Kunstcentrum bewerken"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2436
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -27584,10 +28492,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 "Kunstwerk bewerken"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2442
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -27597,5 +28505,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 "Religieus gebouw bewerken"
@@ -27604,6 +28512,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 "Religie"
@@ -27612,6 +28520,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 "Bahai"
@@ -27620,6 +28528,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 "Boeddhisme"
@@ -27628,6 +28536,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 "Christelijk"
@@ -27636,6 +28544,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 "Hindoestaans"
@@ -27644,6 +28552,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 "Jain"
@@ -27652,6 +28560,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 "Joods"
@@ -27660,6 +28568,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 "Moslim"
@@ -27668,6 +28576,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"
@@ -27676,14 +28584,14 @@
 #. 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 "Spirtualist"
+msgstr "Spiritualist"
 
 #. item "Culture/Place of Worship" combo "Religion" display value
 #. 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"
@@ -27692,30 +28600,30 @@
 #. 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 ""
+msgstr "Unitariaan"
 
 #. item "Culture/Place of Worship" combo "Religion" display value
 #. 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 ""
+msgstr "Zoroastriaan"
 
 #. item "Culture/Place of Worship" combo "Denomination"
 #. 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 "Benaming"
+msgstr "Subgroep"
 
 #. item "Culture/Place of Worship" combo "Denomination" display value
 #. 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 "Anglicaan"
@@ -27724,6 +28632,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"
@@ -27732,6 +28640,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 "Katholiek"
@@ -27740,6 +28648,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 "Evangelist"
@@ -27748,14 +28656,14 @@
 #. 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 "Jehovahs getuigen"
+msgstr "Jehova's getuigen"
 
 #. item "Culture/Place of Worship" combo "Denomination" display value
 #. 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 "Luthers"
@@ -27764,6 +28672,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 "Methodist"
@@ -27772,6 +28680,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"
@@ -27780,6 +28688,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 "Orthodox"
@@ -27788,22 +28696,22 @@
 #. 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 ""
+msgstr "Pentecostaal"
 
 #. item "Culture/Place of Worship" combo "Denomination" display value
 #. 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 ""
+msgstr "Presbyteriaan"
 
 #. item "Culture/Place of Worship" combo "Denomination" display value
 #. 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 "Protestant"
@@ -27812,6 +28720,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 "Quaker"
@@ -27820,44 +28728,44 @@
 #. 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 ""
+msgstr "Sjiiet"
 
 #. item "Culture/Place of Worship" combo "Denomination" display value
 #. 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 ""
+msgstr "Soenniet"
 
 #. item "Culture/Place of Worship" combo "Service Times"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2451
 msgid "Service Times"
-msgstr ""
+msgstr "Tijden diensten"
 
 #. 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 ""
+msgstr "Zo 10:00"
 
 #. 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 ""
+msgstr "Zo 10:30"
 
 #. 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 ""
+msgstr "Zo 11:00"
 
 #. 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 ""
+msgstr "Openingstijden (bezoek)"
 
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2454
 msgid "Recording Studio"
 msgstr "Opnamestudio"
@@ -27865,15 +28773,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 "Wijzig Opnamestudio"
+msgstr "Opnamestudio bewerken"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "audio"
 msgstr "audio"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2461
 msgid "video"
 msgstr "video"
@@ -27881,5 +28789,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 "Openbaar gebouw"
@@ -27887,10 +28795,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 "Openbaar gebouw bewerken"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2473
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -27898,5 +28806,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 "Stadhuis bewerken"
@@ -27905,10 +28813,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 "Gemeenschapscentrum"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2488
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27916,10 +28824,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 "Ambassade bewerken"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2494
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -27928,10 +28836,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 "Gerechtsgebouw bewerken"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2501
 msgid "Prison"
 msgstr "Gevangenis"
@@ -27940,12 +28848,12 @@
 #. 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 "Gevangenis bewerken"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2508
 msgid "Police"
-msgstr "Politie"
+msgstr "Politiebureau"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
@@ -27953,10 +28861,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 "Politie bewerken"
+msgstr "Politiebureau bewerken"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2516
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -27965,10 +28873,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 "Brandweerkazerne bewerken"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2523
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -27976,25 +28884,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 "Postkantoor bewerken"
 
 #. group "Education"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2531
 msgid "Education"
 msgstr "Opvoeding"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2532
 msgid "Kindergarten"
-msgstr "Kinderopvang"
+msgstr "Kindercrèche"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2533
 msgid "Edit Kindergarten"
-msgstr "Kinderopvang bewerken"
+msgstr "Kindercrèche bewerken"
 
 #. item "Education/School"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2537
 msgid "School"
 msgstr "School"
@@ -28002,10 +28910,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 "School bewerken"
 
 #. item "Education/University"
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2543
 msgid "University"
 msgstr "Universiteit"
@@ -28013,21 +28921,21 @@
 #. <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 "Universiteit bewerken"
 
 #. item "Education/College"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2549
 msgid "College"
-msgstr "Campus"
+msgstr "Hogeschool"
 
 #. <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 "Campus bewerken"
+msgstr "Hogeschool bewerken"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2555
 msgid "Driving School"
 msgstr "Rijschool"
@@ -28035,20 +28943,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 "Wijzig rijschool"
+msgstr "Rijschool bewerken"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2562
 msgid "License Classes"
-msgstr "Rijbewijsopleiding"
+msgstr "Soorten rijbewijzen"
 
 #. group "Health"
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2565
 msgid "Health"
 msgstr "Gezondheid"
 
 #. item "Health/Hospital"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2566
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -28056,42 +28964,42 @@
 #. <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 "Ziekenhuis bewerken"
 
 #. item "Health/Doctors"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2572
 msgid "Doctors"
-msgstr "Huisarts"
+msgstr "Dokterspraktijk"
 
 #. <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 "Huisarts bewerken"
+msgstr "Dokterspraktijk bewerken"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2579
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2580
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
 #. item "Health/Nursing Home"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2585
 msgid "Nursing Home"
-msgstr ""
+msgstr "Verpleeghuis"
 
 #. item "Health/Nursing Home" label "Edit Nursing Home"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2586
 msgid "Edit Nursing Home"
-msgstr ""
+msgstr "Verpleeghuis bewerken"
 
 #. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2592
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -28099,5 +29007,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 "Apotheek bewerken"
@@ -28105,10 +29013,10 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2596
 msgid "Dispensing"
-msgstr "Aflevering"
+msgstr "Afleveren"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2600
 msgid "Hearing Aids"
 msgstr "Hoorapparaten"
@@ -28116,23 +29024,23 @@
 #. <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 "Wijzig Hoorapparaten"
+msgstr "Hoorapparaten bewerken"
 
 #. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2610
 msgid "Baby Hatch"
-msgstr "Vondelingenschuif"
+msgstr "Vondelingenluik"
 
 #. <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 "Wijzig Vondelingenschuif"
+msgstr "Vondelingenluik bewerken"
 
 #. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2618
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -28141,5 +29049,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 "EHBO-post bewerken"
@@ -28148,22 +29056,22 @@
 #. <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 "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2625
 msgid "Point Name"
-msgstr ""
+msgstr "Naam punt"
 
 #. 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 "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
+msgstr "(Gebruik de landtoegangscode, b.v. +31-20-3456789)"
 
 #. <space />
 #. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2632
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -28172,10 +29080,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 "Dierenarts bewerken"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2649
 msgid "limited"
 msgstr "beperkt"
@@ -28183,15 +29091,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 "Opmerking"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2652
 msgid "Post Box"
-msgstr "Postbus"
+msgstr "Brievenbus"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2657
 msgid "Telephone"
 msgstr "Telefoon"
@@ -28200,15 +29108,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 "Een telefoon bewerken"
+msgstr "Telefoon bewerken"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2668
 msgid "Telephone cards"
-msgstr "Telefoonkaart"
+msgstr "Telefoonkaarten"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2670
 msgid "Clock"
 msgstr "Klok"
@@ -28217,7 +29125,7 @@
 #. 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 "Wijzig Klok"
+msgstr "Klok bewerken"
 
 #. <key key="amenity" value="clock" />
@@ -28225,5 +29133,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 "Scherm"
@@ -28231,85 +29139,80 @@
 #. 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"
-msgstr ""
+msgstr "analoog"
 
 #. 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"
-msgstr ""
+msgstr "digitaal"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "sundial"
-msgstr ""
+msgstr "zonnewijzer"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2676
 msgctxt "display"
 msgid "unorthodox"
-msgstr ""
+msgstr "onorthodox"
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "Support"
 msgstr "Draagsteun"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
-msgid "pole"
-msgstr "paal"
+#: build/trans_presets.java:2677
+msgid "wall_mounted"
+msgstr "wandsteun"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
-msgid "wall_mounted"
-msgstr "wand"
-
-#. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2677
 msgid "billboard"
-msgstr "reklamepaneel"
+msgstr "reclamebord"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "Visibility/readability"
 msgstr "Zichtbaarheid/leesbaarheid"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 5m)"
 msgstr "(tot 5 m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(up to 20m)"
-msgstr "(tot 20m)"
+msgstr "(tot 20 m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2678
 msgid "(more than 20m)"
-msgstr "(meer dan 20m)"
+msgstr "(meer dan 20 m)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2679
 msgid "Shows current date"
-msgstr "Toont datum"
+msgstr "Toont huidige datum"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2680
 msgid "Shows temperature"
 msgstr "Toont temperatuur"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2681
 msgid "Shows barometric pressure"
 msgstr "Toont luchtdruk"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2682
 msgid "Shows humidity"
 msgstr "Toont luchtvochtigheid"
@@ -28317,210 +29220,210 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2685
 msgid "Recycling"
-msgstr "Recycling"
+msgstr "Inzamelpunt recyclen"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. 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 "Recyclebakken"
+msgstr "Inzamelpunt recyclen bewerken"
 
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2690
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2691
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2693
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2694
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2695
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "container"
-msgstr ""
+msgstr "container"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2696
 msgid "centre"
-msgstr ""
+msgstr "centraal"
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2698
 msgid "Waste Basket"
-msgstr "Vuilbak"
+msgstr "Vuilnisbak"
 
 #. <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 "Wijzig Vuilbak"
+msgstr "Vuilnisbak bewerken"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2707
 msgid "Backrest"
-msgstr ""
+msgstr "Ruggensteun"
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "Material"
 msgstr "Materiaal"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "stone"
 msgstr "steen"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2708
 msgid "plastic"
 msgstr "plastiek"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgid "Colour"
 msgstr "Kleur"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "black"
-msgstr ""
+msgstr "zwart"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "brown"
-msgstr ""
+msgstr "bruin"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "green"
-msgstr ""
+msgstr "groen"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "red"
-msgstr ""
+msgstr "rood"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "blue"
-msgstr ""
+msgstr "blauw"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "gray"
-msgstr ""
+msgstr "grijs"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2709
 msgctxt "color"
 msgid "white"
-msgstr ""
+msgstr "wit"
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2710
 msgid "Amount of Seats"
 msgstr "Aantal zitplaatsen"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2713
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgid "Type of shelter"
-msgstr ""
+msgstr "Type schuilplaats"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "weather_shelter"
-msgstr ""
+msgstr "weer_schuilplaats"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "public_transport"
-msgstr ""
+msgstr "bus_hokje"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "picnic_shelter"
-msgstr ""
+msgstr "picknick_schuilplaats"
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2717
 msgctxt "shelter"
 msgid "wildlife_hide"
-msgstr ""
+msgstr "wild_schuilplaats"
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2719
 msgid "Hunting Stand"
-msgstr "Vogeluitkijkpost"
+msgstr "Jachthut"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2720
 msgid "Edit Hunting Stand"
-msgstr "Vogeluitkijkpost bewerken"
+msgstr "Jachthut bewerken"
 
 #. <key key="amenity" value="hunting_stand" />
 #. 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 "Hoogte"
 
 #. 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"
-msgstr "Kruiphoogte"
+msgstr "laag"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "half"
-msgstr "Bukhoogte"
+msgstr "half"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2722
 msgid "full"
-msgstr "Stahoogte"
+msgstr "hoog"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2724
 msgid "Hide"
 msgstr "Verborgen"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2725
 msgid "Lock"
 msgstr "Afgesloten"
@@ -28528,5 +29431,5 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2728
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -28535,10 +29438,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 "Drinkwater bewerken"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2735
 msgid "Fire Hydrant"
 msgstr "Brandkraan"
@@ -28547,11 +29450,11 @@
 #. 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 "Wijzig Brandkraan"
+msgstr "Brandkraan bewerken"
 
 #. 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"
@@ -28559,88 +29462,83 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "pillar"
-msgstr ""
+msgstr "pilaar"
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2740
 msgctxt "pipeline"
 msgid "wall"
-msgstr ""
+msgstr "muur"
 
 #. 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"
+msgstr "vijver"
+
+#. 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"
-msgstr ""
+msgstr "rijstrook"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "parking_lot"
-msgstr ""
+msgstr "parkeerplaats"
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2747
 msgctxt "hydrant position"
 msgid "sidewalk"
-msgstr ""
+msgstr "trottoir"
 
 #. 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
+msgstr "groen"
+
+#. 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 ""
+msgstr "afzuiging"
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2749
 msgid "Count"
-msgstr ""
+msgstr "Aantal"
 
 #. 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 "Sporten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2754
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. 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 "Stadion bewerken"
@@ -28654,6 +29552,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 "sport selecteren:"
@@ -28999,34 +29897,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"
@@ -29036,6 +29934,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 "Meervoudig"
@@ -29045,6 +29943,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 "Boogschieten"
@@ -29054,6 +29952,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 "Atletiek"
@@ -29063,8 +29961,8 @@
 #. 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 ""
+msgstr "Amerikaans voetbal"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29072,8 +29970,8 @@
 #. 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 "Australisch football"
+msgstr "Australisch voetbal"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29081,6 +29979,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 "Honkbal"
@@ -29090,8 +29988,8 @@
 #. 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 "Basketball"
+msgstr "Basketbal"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29099,8 +29997,8 @@
 #. 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"
+msgstr "Jeu de boules"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29108,6 +30006,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 "Bowling"
@@ -29117,8 +30015,8 @@
 #. 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 ""
+msgstr "Canadees voetbal"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29126,6 +30024,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 "Kanoën"
@@ -29135,6 +30033,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 "Klimmen"
@@ -29144,6 +30042,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 "Cricket"
@@ -29153,8 +30051,8 @@
 #. 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 "Cricket netten"
+msgstr "cricket oefenbaan"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29162,6 +30060,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 "Croquet"
@@ -29171,6 +30069,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 "Fietsen"
@@ -29180,8 +30078,8 @@
 #. 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 "Hondenraces"
+msgstr "Hondenrennen"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29189,8 +30087,8 @@
 #. 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 "Paardensport"
+msgstr "Paardrijden"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29198,8 +30096,8 @@
 #. 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 ""
+msgstr "Gaelic voetbal"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29207,6 +30105,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"
@@ -29216,6 +30114,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 "Turnen"
@@ -29225,6 +30123,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 "Hockey"
@@ -29234,8 +30132,8 @@
 #. 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 "Paardenraces"
+msgstr "Paardenrennen"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29243,6 +30141,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 "Motorsport"
@@ -29252,6 +30150,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"
@@ -29261,6 +30159,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 "Badminton"
@@ -29270,8 +30168,8 @@
 #. 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 ""
+msgstr "rugby League"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29279,8 +30177,8 @@
 #. 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 ""
+msgstr "rugby Union"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport" display value
@@ -29288,6 +30186,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 "Schieten"
@@ -29297,6 +30195,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 "Skateboarden"
@@ -29306,6 +30204,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 "Schaatsen"
@@ -29315,6 +30213,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 "Skiën"
@@ -29324,6 +30222,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 "Voetbal"
@@ -29333,6 +30231,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 "Zwemmen"
@@ -29342,6 +30240,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 "Tafeltennis"
@@ -29351,73 +30249,73 @@
 #. 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 "Sportcentrum"
 
 #. 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 "Sportcentrum bewerken"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2773
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2774
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2782
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2783
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2791
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. 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 "Golfbaan bewerken"
 
 #. 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 "Minigolf bewerken"
 
 #. 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 "Verzameling"
+msgstr "Meervoudige sporten"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2806
 msgid "Edit Multi"
-msgstr "Verzameling bewerken"
+msgstr "Meervoudige sporten bewerken"
 
 #. item "Sport/Multi" combo "type"
@@ -29463,25 +30361,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 "soort"
@@ -29531,26 +30429,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 "Sportveld"
@@ -29600,26 +30498,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 "Sportcentrum"
@@ -29664,149 +30562,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 ""
+msgstr "bowlen"
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2812
 msgid "Edit 10pin"
-msgstr ""
+msgstr "Bowlen bewerken"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2817
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2818
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2823
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2824
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2829
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2830
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2835
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2836
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2842
 msgid "Edit Cycling"
-msgstr "Fietsen bewerken"
+msgstr "Wielrennen bewerken"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2847
 msgid "Dog Racing"
-msgstr "Hondenracen"
+msgstr "Hondenrennen"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2848
 msgid "Edit Dog Racing"
-msgstr "Hondenracen bewerken"
+msgstr "Hondenrennen bewerken"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2853
 msgid "Equestrian"
-msgstr "Paardensport"
+msgstr "Paardrijden"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2854
 msgid "Edit Equestrian"
-msgstr "Wijzig Paardensport"
+msgstr "Paardrijden bewerken"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2859
 msgid "Horse Racing"
-msgstr "Paardenracen"
+msgstr "Paardenrennen"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2860
 msgid "Edit Horse Racing"
-msgstr "Paardenracen bewerken"
+msgstr "Paardenrennen bewerken"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2865
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2866
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2871
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2872
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2877
 msgid "Skateboard"
-msgstr "Skateboard"
+msgstr "Skateboarden"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2878
 msgid "Edit Skateboard"
-msgstr "Skateboard bewerken"
+msgstr "Skateboarden bewerken"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2883
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2884
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -29814,60 +30712,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 "Skiën bewerken"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "downhill"
 msgstr "bergafwaarts"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "nordic"
 msgstr "Scandinavisch"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2894
 msgid "snow_park"
-msgstr ""
+msgstr "sneeuw_park"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "novice"
 msgstr "beginner"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "easy"
 msgstr "eenvoudig"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "advanced"
-msgstr ""
+msgstr "gevorderd"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "expert"
 msgstr "expert"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2895
 msgid "freeride"
-msgstr ""
+msgstr "vrij skiën"
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2898
 msgid "Shooting"
 msgstr "Schieten"
@@ -29875,105 +30773,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 "Schieten bewerken"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2906
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2907
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2908
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2913
 msgid "Australian Football"
-msgstr "Australisch football"
+msgstr "Australisch voetbal"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2914
 msgid "Edit Australian Football"
-msgstr "Australisch football bewerken"
+msgstr "Australisch voetbal bewerken"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2919
 msgid "American Football"
 msgstr "Amerikaans voetbal"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2920
 msgid "Edit American Football"
-msgstr "Wijzig Amerikaans voetbal"
+msgstr "Amerikaans voetbal bewerken"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2925
 msgid "Canadian Football"
-msgstr ""
+msgstr "Canadees voetbal"
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2926
 msgid "Edit Canadian Football"
-msgstr ""
+msgstr "Canadees voetbal bewerken"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2931
 msgid "Gaelic Football"
-msgstr ""
+msgstr "Gaelic voetbal"
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2932
 msgid "Edit Gaelic Football"
-msgstr ""
+msgstr "Gaelic voetbal bewerken"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2937
 msgid "Rugby League"
-msgstr ""
+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 ""
+msgstr "Rugby - League bewerken"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2943
 msgid "Rugby Union"
-msgstr ""
+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 ""
+msgstr "Rugby - Union bewerken"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2949
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2950
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2955
 msgid "Basketball"
-msgstr "Basketball"
+msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2956
 msgid "Edit Basketball"
-msgstr "Basketball bewerken"
+msgstr "Basketbal bewerken"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2961
 msgid "Volleyball"
 msgstr "Volleybal"
@@ -29981,10 +30879,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 "Wijzig Volleybal"
+msgstr "Volleybal bewerken"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2970
 msgid "Beachvolleyball"
 msgstr "Beachvolleybal"
@@ -29992,120 +30890,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 "Wijzig Beachvolleybal"
+msgstr "Beachvolleybal bewerken"
 
 #. 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 "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2983
 msgid "golf_course"
 msgstr "golfbaan"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2985
 msgid "Boule"
-msgstr "Boule"
+msgstr "Jeu de boules"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2986
 msgid "Edit Boule"
-msgstr "Boule bewerken"
+msgstr "Jeu de boules bewerken"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2991
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2992
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:2997
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:2998
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3003
 msgid "Cricket Nets"
-msgstr "Cricketnetten"
+msgstr "Cricket oefenbaan"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3004
 msgid "Edit Cricket Nets"
-msgstr "Cricketnetten bewerken"
+msgstr "Cricket oefenbaan bewerken"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3009
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3010
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3015
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3016
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
 #. 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 "Pelota bewerken"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3027
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3028
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3033
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3034
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
 #. 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 "Tennis bewerken"
@@ -30113,72 +31011,72 @@
 #. 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 "Motorsport"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3048
 msgid "Edit Motorsport"
-msgstr "Wijzig Motorsport"
+msgstr "Motorsport bewerken"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3053
 msgid "Karting"
-msgstr "Karting"
+msgstr "Karten"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3054
 msgid "Edit Karting"
-msgstr "Wijzig Karting"
+msgstr "Karten bewerken"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3059
 msgid "Motocross"
-msgstr "Motocross"
+msgstr "Motorcross"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3060
 msgid "Edit Motocross"
-msgstr "Wijzig Motocross"
+msgstr "Motorcross bewerken"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3065
 msgid "Safety Training"
-msgstr ""
+msgstr "Veiligheidstraining"
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3066
 msgid "Edit Safety Training"
-msgstr ""
+msgstr "Veiligheidstraining bewerken"
 
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3072
 msgid "Model Aerodrome"
-msgstr ""
+msgstr "Modelvliegtuigen"
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3073
 msgid "Edit Model Aerodrome"
-msgstr ""
+msgstr "Modelvliegtuigen bewerken"
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3078
 msgid "RC Car"
-msgstr ""
+msgstr "Op afstand bestuurbare auto's"
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3079
 msgid "Edit RC Car"
-msgstr ""
+msgstr "Op afstand bestuurbare auto's bewerken"
 
 #. 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 "Bouwwerken"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3088
 msgid "Building"
 msgstr "Gebouw"
@@ -30186,25 +31084,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 "Toren"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3092
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "Tower type"
-msgstr "Type mast"
+msgstr "Type toren"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "communication"
-msgstr "kommunikatie"
+msgstr "communicatie"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3095
 msgid "observation"
 msgstr "observatie"
@@ -30213,13 +31111,13 @@
 #. 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 "Hoogte (meter)"
+msgstr "Hoogte (meters)"
 
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3101
 msgid "Flagpole"
-msgstr "Vlaggemast"
+msgstr "Vlaggenmast"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
@@ -30227,15 +31125,15 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3106
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3107
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3111
 msgid "Chimney"
 msgstr "Schoorsteen"
@@ -30243,10 +31141,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 "Wijzig Schoorsteen"
+msgstr "Schoorsteen bewerken"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3120
 msgid "Windmill"
 msgstr "Windmolen"
@@ -30254,29 +31152,29 @@
 #. <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 "Windmolen bewerken"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3126
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3127
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3131
 msgid "Pipeline"
-msgstr "Pijplijn"
+msgstr "Pijpleiding"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. 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 "Pijplijn bewerken"
+msgstr "Pijpleiding bewerken"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
@@ -30318,8 +31216,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
@@ -30329,10 +31227,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 "gas"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "heat"
 msgstr "warmte"
@@ -30340,26 +31238,26 @@
 #. 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 "olie"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3137
 msgid "sewage"
 msgstr "afvalwater"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgid "Location"
 msgstr "Locatie"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "underwater"
-msgstr "onderwater"
+msgstr "onder water"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3138
 msgctxt "pipeline"
 msgid "overground"
@@ -30367,5 +31265,5 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3140
 msgid "Crane"
 msgstr "Kraan"
@@ -30373,10 +31271,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 "Kraan bewerken"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3146
 msgid "Mineshaft"
 msgstr "Mijnschacht"
@@ -30385,31 +31283,31 @@
 #. 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 "Wijzig Mijnschacht"
+msgstr "Mijnschacht bewerken"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "Function"
 msgstr "Werking"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "winding"
-msgstr "ondergronds"
+msgstr "kabels"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3152
 msgid "air"
 msgstr "openlucht"
 
 #. 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 "Diepte in meter"
+msgstr "Diepte in meters"
 
 #. 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 "Delfstof"
@@ -30417,5 +31315,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 "zand_steenslag"
@@ -30423,5 +31321,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 "bauxiet_(aluminium)"
@@ -30430,6 +31328,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 "kolen"
@@ -30437,5 +31335,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 "koper"
@@ -30443,5 +31341,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 "natuursteen"
@@ -30449,5 +31347,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 "goud"
@@ -30455,5 +31353,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 "ilmeniet_(ijzertitanaat)"
@@ -30461,5 +31359,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 "ijzererts"
@@ -30467,5 +31365,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 "lood"
@@ -30473,5 +31371,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 "kalksteen"
@@ -30479,5 +31377,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"
@@ -30485,5 +31383,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 "rutiel (titanium)"
@@ -30491,5 +31389,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 "zout"
@@ -30497,5 +31395,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 "zilver"
@@ -30503,5 +31401,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 "tin"
@@ -30509,5 +31407,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 "zink"
@@ -30515,48 +31413,48 @@
 #. 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 "zirconium"
+msgstr "zirkonium"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3156
 msgid "Visible Headframe"
-msgstr "Zichtbaar Schachtblok"
+msgstr "Zichtbaar schachtblok"
 
 #. 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 "Buiten gebruik"
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3159
 msgid "Adit"
-msgstr "Toegangstunnel"
+msgstr "Horizontale toegangstunnel"
 
 #. <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 "Wijzig Toegangstunnel"
+msgstr "Horizontale toegangstunnel bewerken"
 
 #. 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 "Lengte in meter"
+msgstr "Lengte in meters"
 
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3170
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. 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 "Watertoren bewerken"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3175
 msgid "Water Works"
 msgstr "Waterwerken"
@@ -30564,12 +31462,12 @@
 #. <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 "Wijzig Waterwerken"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3183
 msgid "Wastewater Plant"
-msgstr "Afvalzuivering"
+msgstr "Afvalwaterzuivering"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
@@ -30577,10 +31475,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 "Afvalzuivering bewerken"
+msgstr "Afvalwaterzuivering bewerken"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3191
 msgid "Watermill"
 msgstr "Watermolen"
@@ -30588,10 +31486,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 "Wijzig Watermolen"
+msgstr "Watermolen bewerken"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3198
 msgid "Fountain"
 msgstr "Fontein"
@@ -30600,10 +31498,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 "Fontein bewerken"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3205
 msgid "Water Well"
 msgstr "Waterbron"
@@ -30611,11 +31509,11 @@
 #. <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 "Wijzig Waterbron"
+msgstr "Waterbron bewerken"
 
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3212
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -30623,5 +31521,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 "Vuurtoren bewerken"
@@ -30629,33 +31527,33 @@
 #. <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 "Baken bewerken"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3223
+#: build/trans_presets.java:3224
 msgid "Street Lamp"
-msgstr "Straatlamp"
+msgstr "Straatlantaarn"
 
 #. <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 "Wijzig Straatlamp"
+msgstr "Straatlantaarn bewerken"
 
 #. <space />
 #. <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 "Brandtijden"
 
 #. 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 "Ma-Vr 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 "Meetstation"
@@ -30663,61 +31561,61 @@
 #. <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 "Wijzig Meetstation"
+msgstr "Meetstation bewerken"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "Measurement"
 msgstr "Meting"
 
 #. 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 "fijnstof"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "seismic"
 msgstr "aardbevingen"
 
 #. 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 "waterniveau"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3238
 msgid "weather"
 msgstr "weer"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "Recording"
-msgstr "Opname"
+msgstr "Opnemen"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "manually"
 msgstr "handmatig"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "automated"
 msgstr "automatisch"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3239
 msgid "remote"
 msgstr "van op afstand"
 
 #. 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"
-msgstr ""
+msgstr "nee"
 
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3242
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -30725,10 +31623,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 "Uitkijkpunt bewerken"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3247
+#: build/trans_presets.java:3248
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -30736,30 +31634,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 "Bewakingscamera bewerken"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "indoor"
 msgstr "binnenshuis"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "outdoor"
 msgstr "buiten"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3253
 msgid "public"
-msgstr "Openbaar"
+msgstr "openbaar"
 
 #. group "Power"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3256
 msgid "Power"
 msgstr "Energie"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3257
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -30769,153 +31667,153 @@
 #. 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 "Energievoorziening bewerken"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biofuel"
-msgstr ""
+msgstr "biobrandstof"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biogas"
-msgstr ""
+msgstr "biogas"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "biomass"
-msgstr ""
+msgstr "biomassa"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "diesel"
-msgstr ""
+msgstr "diesel"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "gasoline"
-msgstr ""
+msgstr "gasolie"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "geothermal"
-msgstr ""
+msgstr "geothermisch"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "hydro"
 msgstr "water"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "nuclear"
 msgstr "nucleair"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "osmotic"
-msgstr ""
+msgstr "waterdruk"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "solar"
-msgstr ""
+msgstr "zon"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "tidal"
-msgstr ""
+msgstr "getijden"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "waste"
-msgstr ""
+msgstr "afval"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wave"
-msgstr ""
+msgstr "golven"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3264
 msgid "wind"
 msgstr "wind"
 
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "Method"
-msgstr ""
+msgstr "Methode"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "anaerobic_digestion"
-msgstr ""
+msgstr "anaerobische_vertering"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "combustion"
-msgstr ""
+msgstr "verbranding"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "dam"
-msgstr ""
+msgstr "dam"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fission"
-msgstr ""
+msgstr "splitsing"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "fusion"
-msgstr ""
+msgstr "fusie"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "gasification"
-msgstr ""
+msgstr "vergassen"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "photovoltaic"
-msgstr "fotovoltage"
+msgstr "fotovoltaïsch"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumped-storage"
-msgstr ""
+msgstr "opslagpompen"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pumping"
-msgstr ""
+msgstr "pompen"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "pyrolysis"
-msgstr ""
+msgstr "verbranding"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "run-of-the-river"
-msgstr ""
+msgstr "waterstroom"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3265
 msgid "thermal"
-msgstr ""
+msgstr "thermisch"
 
 #. <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 ""
+msgstr "Uitvoervormen van energie"
 
 #. item "Power/Power Generator" combo "electricity"
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:3268
 msgid "electricity"
-msgstr ""
+msgstr "electriciteit"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30928,11 +31826,11 @@
 #. 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 ""
+msgstr "2 W"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30945,11 +31843,11 @@
 #. 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 ""
+msgstr "3 kW"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30962,11 +31860,11 @@
 #. 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 ""
+msgstr "5 MW"
 
 #. item "Power/Power Generator" combo "electricity" display value
@@ -30979,54 +31877,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 "7 GW"
+
+#. item "Power/Power Generator" combo "hot water"
+#: build/trans_presets.java:3269
+msgid "hot water"
+msgstr "heet water"
+
+#. item "Power/Power Generator" combo "hot air"
+#: build/trans_presets.java:3270
+msgid "hot air"
+msgstr "hete lucht"
+
+#. item "Power/Power Generator" combo "cold water"
+#: build/trans_presets.java:3271
+msgid "cold water"
+msgstr "koud water"
+
+#. item "Power/Power Generator" combo "cold air"
+#: build/trans_presets.java:3272
+msgid "cold air"
+msgstr "koude lucht"
+
+#. item "Power/Power Generator" combo "compressed air"
+#: build/trans_presets.java:3273
+msgid "compressed air"
+msgstr "samengeperste lucht"
+
+#. item "Power/Power Generator" combo "steam"
+#: build/trans_presets.java:3274
+msgid "steam"
+msgstr "stoom"
+
+#. 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 ""
+msgstr "vacuüm"
 
 #. item "Power/Power Generator" combo "battery charging"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3276
 msgid "battery charging"
-msgstr ""
+msgstr "opladen van batterijen"
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3278
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -31035,10 +31933,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 "Verdeelstation bewerken"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3287
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -31047,5 +31945,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 "Transformatorstation bewerken"
@@ -31053,10 +31951,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 "Lijnreferentie"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3294
+#: build/trans_presets.java:3295
 msgid "Cable Distribution Cabinet"
 msgstr "Verdeelkast"
@@ -31065,11 +31963,11 @@
 #. 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 "Wijzig verdeelkast"
+msgstr "Verdeelkast bewerken"
 
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3303
+#: build/trans_presets.java:3304
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -31080,5 +31978,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 "Hoogspanningsmast bewerken"
@@ -31086,28 +31984,28 @@
 #. <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 "Referentie toren"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3312
+#: build/trans_presets.java:3313
 msgid "Pole"
-msgstr "Mast"
+msgstr "Electriciteitsmast"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dpole"
 #. 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 "Wijzig (hoogspannings)Mast"
+msgstr "Electriciteitsmast bewerken"
 
 #. <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 "Referentie mast"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3319
+#: build/trans_presets.java:3320
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -31116,15 +32014,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 "Hoogspanningskabels bewerken"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgid "Line type"
 msgstr "Type lijn"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3324
 msgctxt "Power Line"
 msgid "line"
@@ -31132,5 +32030,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"
@@ -31138,40 +32036,40 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3328
+#: build/trans_presets.java:3329
 msgid "Amount of Cables"
 msgstr "Aantal kabels"
 
 #. 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 "Aantal geleiders per kabel"
 
 #. 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 "enkel"
 
 #. 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 "dubbel"
 
 #. 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 "drievoudig"
 
 #. 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 "viervoudig"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3332
+#: build/trans_presets.java:3333
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3333
+#: build/trans_presets.java:3334
 msgid "Castle"
 msgstr "Kasteel"
@@ -31180,137 +32078,137 @@
 #. 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 "Kasteel bewerken"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3341
+#: build/trans_presets.java:3342
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3342
+#: build/trans_presets.java:3343
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3347
+#: build/trans_presets.java:3348
 msgid "Archaeological Site"
-msgstr "Archeologische plaats"
+msgstr "Archeologische opgraving"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. 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 "Archeologische plaats bewerken"
+msgstr "Archeologische opgraving bewerken"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3356
 msgid "Battlefield"
-msgstr "Slagveld"
+msgstr "Historisch slagveld"
 
 #. <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 "Slagveld bewerken"
+msgstr "Historisch slagveld bewerken"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3362
 msgid "Palaeontological Site"
-msgstr "Paleontologische plaats"
+msgstr "Paleontologische opgraving"
 
 #. <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 "Wijzig Paleontologische plaats"
+msgstr "Paleontologische opgraving bewerken"
 
 #. <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 "Monument bewerken"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3374
 msgid "Memorial"
-msgstr "Herdenkingsplek"
+msgstr "Gedenkplaats"
 
 #. <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 "Herdenkingsplek bewerken"
+msgstr "Gedenkplaats bewerken"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3380
 msgid "Wayside Cross"
-msgstr "Kruis langs de weg"
+msgstr "Wegkruis"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3381
 msgid "Edit Wayside Cross"
-msgstr "Kruis langs de weg bewerken"
+msgstr "Wegkruis bewerken"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3384
+#: build/trans_presets.java:3385
 msgid "Wayside Shrine"
-msgstr "Kapelletje langs de weg"
+msgstr "Kruisbeeld"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3386
 msgid "Edit Wayside Shrine"
-msgstr "Kapelletje bewerken"
+msgstr "Kruisbeeld bewerken"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3389
+#: build/trans_presets.java:3390
 msgid "Boundary Stone"
-msgstr "Grenspaal"
+msgstr "Historische grenspaal"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3390
+#: build/trans_presets.java:3391
 msgid "Edit Boundary Stone"
-msgstr "Wijzig Grenspaal"
+msgstr "Historische grenspaal bewerken"
 
 #. group "Shops"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3397
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3398
 msgid "Food"
 msgstr "Voeding"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3398
+#: build/trans_presets.java:3399
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3400
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3404
+#: build/trans_presets.java:3405
 msgid "Convenience Store"
-msgstr ""
+msgstr "Buurt-supermarkt"
 
 #. <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 ""
+msgstr "Buurt-supermarkt bewerken"
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3412
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -31318,5 +32216,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 "Kiosk bewerken"
@@ -31324,5 +32222,5 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3420
 msgid "Baker"
 msgstr "Bakker"
@@ -31330,10 +32228,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 "Bakker bewerken"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3427
 msgid "Butcher"
 msgstr "Slager"
@@ -31341,10 +32239,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 "Slager bewerken"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3434
 msgid "Seafood"
 msgstr "Viswinkel"
@@ -31352,33 +32250,33 @@
 #. <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 "Wijzig Viswinkel"
+msgstr "Viswinkel bewerken"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3443
 msgid "Deli (Fine Food)"
-msgstr "Deli (fijnkost)"
+msgstr "Delicatessen (fijne kost)"
 
 #. <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 "Wijzig Deli (fijnkost)"
+msgstr "Delicatessen (fijne kost) bewerken"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3451
+#: build/trans_presets.java:3452
 msgid "Confectionery"
-msgstr ""
+msgstr "Snoepwinkel"
 
 #. <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 ""
+msgstr "Snoepwinkel bewerken"
 
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3459
+#: build/trans_presets.java:3460
 msgid "Marketplace"
 msgstr "Markt"
@@ -31386,10 +32284,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 ""
+msgstr "Markt bewerken"
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3468
+#: build/trans_presets.java:3469
 msgid "Greengrocer"
 msgstr "Groentewinkel"
@@ -31397,47 +32295,47 @@
 #. <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 "Wijzig Groentewinkel"
+msgstr "Groentewinkel bewerken"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3477
+#: build/trans_presets.java:3478
 msgid "Organic"
-msgstr "Biowinkel"
+msgstr "Biologische winkel"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3479
 msgid "Edit Organic Shop"
-msgstr "Wijzig Biowinkel"
+msgstr "Biologische winkel bewerken"
 
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3485
 msgid "Alcohol"
-msgstr ""
+msgstr "Slijterij"
 
 #. <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 ""
+msgstr "Slijterij bewerken"
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3491
+#: build/trans_presets.java:3492
 msgid "Beverages"
-msgstr "Dranken"
+msgstr "Drankwinkel"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3492
+#: build/trans_presets.java:3493
 msgid "Edit Beverages Shop"
-msgstr "Wijzig Drankenhandel"
+msgstr "Drankwinkel bewerken"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3501
 msgid "Edit Clothes Shop"
-msgstr "Wijzig Kledingwinkel"
+msgstr "Kledingwinkel bewerken"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3505
+#: build/trans_presets.java:3506
 msgid "Boutique"
 msgstr "Boetiek"
@@ -31445,20 +32343,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 "Wijzig Boetiek"
+msgstr "Boetiek bewerken"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3514
+#: build/trans_presets.java:3515
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3515
+#: build/trans_presets.java:3516
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3521
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -31466,16 +32364,16 @@
 #. <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 "Buitensportzaak bewerken"
+msgstr "Buitensportwinkel bewerken"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3529
 msgid "Edit Sports Shop"
-msgstr "Sportzaak bewerken"
+msgstr "Sportwinkel bewerken"
 
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3534
+#: build/trans_presets.java:3535
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -31483,10 +32381,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 "Stomerij bewerken"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3541
+#: build/trans_presets.java:3542
 msgid "Laundry"
 msgstr "Wasserette"
@@ -31494,20 +32392,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 "Wasserette bewerken"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3548
+#: build/trans_presets.java:3549
 msgid "Tailor"
 msgstr "Kleermaker"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3550
 msgid "Edit Tailor"
-msgstr "Wijzig Kleermaker"
+msgstr "Kleermaker bewerken"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3554
+#: build/trans_presets.java:3555
 msgid "Fabric"
 msgstr "Stoffen"
@@ -31515,35 +32413,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 "Wijzig Stoffen"
+msgstr "Stoffen bewerken"
 
 #. group "Electronic"
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3565
 msgid "Electronic"
-msgstr "Elektronika"
+msgstr "Elektronica"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3566
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3567
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3572
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3573
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3577
+#: build/trans_presets.java:3578
 msgid "Mobile Phone"
 msgstr "Mobiele telefoons"
@@ -31551,10 +32449,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 "Wijzig Mobiele telefoons"
+msgstr "Mobiele telefoons bewerken"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3586
+#: build/trans_presets.java:3587
 msgid "Vacuum Cleaner"
 msgstr "Stofzuigers"
@@ -31562,35 +32460,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 "Wijzig Stofzuiger"
+msgstr "Stofzuiger bewerken"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3596
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3597
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3602
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3602
+#: build/trans_presets.java:3603
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
 #. group "Cash"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3609
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3610
 msgid "Bank"
 msgstr "Bank"
@@ -31598,5 +32496,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 "Bank bewerken"
@@ -31604,10 +32502,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 "Geldautomaat"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3618
+#: build/trans_presets.java:3619
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -31615,5 +32513,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 "Geldwisselkantoor bewerken"
@@ -31621,21 +32519,21 @@
 #. <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 "Geldautomaat bewerken"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3633
+#: build/trans_presets.java:3634
 msgid "Department Store"
-msgstr "Supermarkt"
+msgstr "Warenhuis"
 
 #. <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 "Wijzig Supermarkt"
+msgstr "Warenhuis bewerken"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3642
+#: build/trans_presets.java:3643
 msgid "Mall"
 msgstr "Winkelcentrum"
@@ -31643,41 +32541,41 @@
 #. <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 "Wijzig Winkelcentrum"
+msgstr "Winkelcentrum bewerken"
 
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3652
+#: build/trans_presets.java:3653
 msgid "Chemist"
 msgstr "Drogisterij"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3653
+#: build/trans_presets.java:3654
 msgid "Edit Chemist"
-msgstr "Wijzig Drogisterij"
+msgstr "Drogisterij bewerken"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:3659
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3659
+#: build/trans_presets.java:3660
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3665
 msgid "Optician"
-msgstr "Optiek"
+msgstr "Opticien"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3666
 msgid "Edit Optician"
-msgstr "Opticiën bewerken"
+msgstr "Opticien bewerken"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3671
 msgid "Jewelry"
 msgstr "Juwelier"
@@ -31685,22 +32583,22 @@
 #. <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 "Wijzig Juwelier"
+msgstr "Juwelier bewerken"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3679
+#: build/trans_presets.java:3680
 msgid "Erotic"
-msgstr "Erotiek"
+msgstr "Seksshop"
 
 #. <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 "Wijzig Erotiek"
+msgstr "Seksshop bewerken"
 
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3690
 msgid "Florist"
 msgstr "Bloemist"
@@ -31708,10 +32606,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 "Bloemist bewerken"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3697
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -31719,5 +32617,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 "Tuincentrum bewerken"
@@ -31725,5 +32623,5 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3705
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -31731,119 +32629,119 @@
 #. <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 "Doe-het-zelfzaak bewerken"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3712
 msgid "Hardware"
-msgstr "IJzerwaren"
+msgstr "Bouwmarkt"
 
 #. <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 "Wijzig IJzerwaren"
+msgstr "Bouwmarkt bewerken"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3719
 msgid "Paint"
-msgstr "Verven"
+msgstr "Verfwinkel"
 
 #. <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 "Wijzig Verven"
+msgstr "Verfwinkel bewerken"
 
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3728
+#: build/trans_presets.java:3729
 msgid "Furniture"
-msgstr "Meubels"
+msgstr "Woonwarenhuis"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3729
+#: build/trans_presets.java:3730
 msgid "Edit Furniture Shop"
-msgstr "Meubelzaak bewerken"
+msgstr "Woonwarenhuis bewerken"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3734
+#: build/trans_presets.java:3735
 msgid "Kitchen"
-msgstr "Keukens"
+msgstr "Keukenzaak"
 
 #. <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 "Wijzig Keukens"
+msgstr "Keukenzaak bewerken"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3743
+#: build/trans_presets.java:3744
 msgid "Curtain"
-msgstr "Gordijnen"
+msgstr "Gordijnenwinkel"
 
 #. <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 "Wijzig Gordijnen"
+msgstr "Gordijnenwinkel bewerken"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3752
+#: build/trans_presets.java:3753
 msgid "Frame"
-msgstr ""
+msgstr "Lijstenwinkel"
 
 #. <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 ""
+msgstr "Lijstenwinkel bewerken Frames"
 
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3763
 msgid "Stationery"
-msgstr "Kantoorartikelen"
+msgstr "Kantoorboekhandel"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3764
 msgid "Edit Stationery Shop"
-msgstr "Kantoorartikelenwinkel bewerken"
+msgstr "Kantoorboekhandel bewerken"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3768
+#: build/trans_presets.java:3769
 msgid "Copyshop"
-msgstr "Copyshop"
+msgstr "Kopieerwinkel"
 
 #. <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 "Wijzig Copyshop"
+msgstr "Kopieerwinkel bewerken"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3777
+#: build/trans_presets.java:3778
 msgid "Book Store"
 msgstr "Boekhandel"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3778
+#: build/trans_presets.java:3779
 msgid "Edit Book Store"
-msgstr "Wijzig Boekhandel"
+msgstr "Boekhandel bewerken"
 
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3784
+#: build/trans_presets.java:3785
 msgid "Travel Agency"
 msgstr "Reisagentschap"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3785
+#: build/trans_presets.java:3786
 msgid "Edit Travel Agency"
-msgstr "Wijzig Reisagentschap"
+msgstr "Reisagentschap bewerken"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3791
 msgid "Musical Instrument"
 msgstr "Muziekinstrumenten"
@@ -31851,31 +32749,31 @@
 #. <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 "Wijzig Muziekinstrumenten"
+msgstr "Muziekinstrumenten bewerken"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3799
+#: build/trans_presets.java:3800
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3800
+#: build/trans_presets.java:3801
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3805
+#: build/trans_presets.java:3806
 msgid "Variety Store"
-msgstr "Kruidenier"
+msgstr "Euroshop"
 
 #. <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 "Wijzig Kruidenier"
+msgstr "Euroshop bewerken"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3815
+#: build/trans_presets.java:3816
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -31883,5 +32781,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 "Verkoopautomaat bewerken"
@@ -31889,180 +32787,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 "Producten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_tickets"
-msgstr "vervoerskaarten"
+msgstr "openbaar vervoersbewijzen"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "public_transport_plans"
-msgstr "overzichtskaart, plan"
+msgstr "overzichtskaart openbaar vervoer"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "parking_tickets"
-msgstr "parkeerbiljet"
+msgstr "parkeerkaartjes"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "food"
 msgstr "voedsel"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "drinks"
 msgstr "frisdranken"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "sweets"
 msgstr "snoepgoed"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "cigarettes"
 msgstr "sigaretten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "photos"
-msgstr "foto’s"
+msgstr "foto's"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "animal_food"
 msgstr "diervoeder"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "news_papers"
 msgstr "kranten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "toys"
 msgstr "speelgoed"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "stamps"
 msgstr "postzegels"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "bicycle_tube"
-msgstr ""
+msgstr "fietsbanden"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "condoms"
 msgstr "condooms"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "tampons"
 msgstr "tampons"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3819
+#: build/trans_presets.java:3820
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. 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 "Geografie"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3832
+#: build/trans_presets.java:3833
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3834
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3834
+#: build/trans_presets.java:3835
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3839
+#: build/trans_presets.java:3840
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:3841
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3845
+#: build/trans_presets.java:3846
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:3847
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:3852
 msgid "Political"
 msgstr "Politiek"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3852
+#: build/trans_presets.java:3853
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:3858
 msgid "National park"
 msgstr "Nationaal park"
 
 #. 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 "Grens Nationaal park bewerken"
 
 #. group "Places"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:3865
 msgid "Places"
 msgstr "Locaties"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3865
+#: build/trans_presets.java:3866
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3866
+#: build/trans_presets.java:3867
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. 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"
@@ -32070,65 +32968,65 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3873
+#: build/trans_presets.java:3874
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Places/State"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:3880
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
-msgstr "Provincie"
+msgstr "Staat"
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3880
+#: build/trans_presets.java:3881
 msgid "Edit State"
-msgstr "Provincie bewerken"
+msgstr "Staat bewerken"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:3887
 msgid "Region"
 msgstr "Regio"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:3888
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Places/County"
-#: build/trans_presets.java:3893
+#: build/trans_presets.java:3894
 msgid "County"
-msgstr ""
+msgstr "Provincie"
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3894
+#: build/trans_presets.java:3895
 msgid "Edit County"
-msgstr ""
+msgstr "Provincie bewerken"
 
 #. <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
 msgid "City"
+msgstr "Stad (groot)"
+
+#. item "Places/City" label "Edit City"
+#: build/trans_presets.java:3903
+msgid "Edit City"
+msgstr "Stad (groot) bewerken"
+
+#. item "Places/Town"
+#: build/trans_presets.java:3909
+msgid "Town"
 msgstr "Stad"
-
-#. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3902
-msgid "Edit City"
-msgstr "Stad bewerken"
-
-#. item "Places/Town"
-#: build/trans_presets.java:3908
-msgid "Town"
-msgstr "Dorp"
 
 #. <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 "Dorp bewerken"
+msgstr "Stad bewerken"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3916
+#: build/trans_presets.java:3917
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -32136,52 +33034,52 @@
 #. <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 "Deelgemeente bewerken"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3924
+#: build/trans_presets.java:3925
 msgid "Village"
-msgstr "Klein dorp"
+msgstr "Dorp"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3925
+#: build/trans_presets.java:3926
 msgid "Edit Village"
-msgstr "Klein dorp bewerken"
+msgstr "Dorp bewerken"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3931
+#: build/trans_presets.java:3932
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3932
+#: build/trans_presets.java:3933
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
 
 #. item "Places/Isolated Dwelling"
-#: build/trans_presets.java:3938
+#: build/trans_presets.java:3939
 msgid "Isolated Dwelling"
-msgstr ""
+msgstr "Afgelegen plaats"
 
 #. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
-#: build/trans_presets.java:3939
+#: build/trans_presets.java:3940
 msgid "Edit Isolated Dwelling"
-msgstr ""
+msgstr "Afgelegen plaats bewerken"
 
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:3947
 msgid "Locality"
-msgstr ""
+msgstr "Onbewoond gebied"
 
 #. <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 ""
+msgstr "Onbewoond gebied bewerken"
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3956
+#: build/trans_presets.java:3957
 msgid "Peak"
 msgstr "Bergtop"
@@ -32189,10 +33087,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 "Bergtop bewerken"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3964
+#: build/trans_presets.java:3965
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -32200,10 +33098,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 "Gletsjer bewerken"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3972
+#: build/trans_presets.java:3973
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -32211,10 +33109,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 "Vulkaan bewerken"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3980
+#: build/trans_presets.java:3981
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -32222,5 +33120,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 "Grotingang bewerken"
@@ -32228,5 +33126,5 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:3989
 msgid "Island"
 msgstr "Eiland"
@@ -32234,26 +33132,26 @@
 #. <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 "Eiland bewerken"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3996
+#: build/trans_presets.java:3997
 msgid "Islet"
-msgstr ""
+msgstr "Klein eiland"
 
 #. <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 ""
+msgstr "Klein eiland bewerken"
 
 #. group "Nature"
-#: build/trans_presets.java:4005
+#: build/trans_presets.java:4006
 msgid "Nature"
-msgstr ""
+msgstr "Natuur"
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4007
 msgid "Tree"
 msgstr "Boom"
@@ -32262,45 +33160,45 @@
 #. 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 "Boom bewerken"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4015
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4017
 msgid "Wood"
-msgstr "Bos"
+msgstr "Oerbos"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. 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 "Bos bewerken"
+msgstr "Oerbos bewerken"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "coniferous"
-msgstr ""
+msgstr "naaldbomen"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "deciduous"
-msgstr ""
+msgstr "loofbomen"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4023
 msgctxt "wood"
 msgid "mixed"
-msgstr ""
+msgstr "gemengd"
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:4024
+#: build/trans_presets.java:4025
 msgid "Forest"
 msgstr "Bosbouw"
@@ -32309,30 +33207,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 "Bosbouw bewerken"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "coniferous"
 msgstr "naaldbomen"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "deciduous"
 msgstr "loofbomen"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:4031
+#: build/trans_presets.java:4032
 msgid "mixed"
 msgstr "gemengd"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:4033
+#: build/trans_presets.java:4034
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4035
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -32340,36 +33238,36 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:4039
+#: build/trans_presets.java:4040
 msgid "Scree"
-msgstr "Puinhelling"
+msgstr "Steenvlakte"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4041
 msgid "Edit Scree"
-msgstr "Puinhelling bewerken"
+msgstr "Steenvlakte bewerken"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:4044
+#: build/trans_presets.java:4045
 msgid "Fell"
-msgstr ""
+msgstr "Hoog grasland"
 
 #. <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 ""
+msgstr "Hoog grasland bewerken"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:4050
+#: build/trans_presets.java:4051
 msgid "Scrub"
-msgstr "Kreupelhout"
+msgstr "Ruig land"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:4051
+#: build/trans_presets.java:4052
 msgid "Edit Scrub"
-msgstr "Kreupelhout bewerken"
+msgstr "Ruig land bewerken"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:4055
+#: build/trans_presets.java:4056
 msgid "Heath"
 msgstr "Heide"
@@ -32377,15 +33275,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 "Heide bewerken"
 
 #. group "Land use"
-#: build/trans_presets.java:4062
+#: build/trans_presets.java:4063
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:4063
+#: build/trans_presets.java:4064
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -32394,56 +33292,56 @@
 #. 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 "Boerenerf bewerken"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4072
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4073
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:4077
+#: build/trans_presets.java:4078
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4079
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4084
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:4084
+#: build/trans_presets.java:4085
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:4090
 msgid "Greenhouse Horticulture"
-msgstr ""
+msgstr "Glastuinbouw"
 
 #. <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 ""
+msgstr "Glastuinbouw bewerken"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:4097
+#: build/trans_presets.java:4098
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:4098
+#: build/trans_presets.java:4099
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -32451,25 +33349,25 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:4104
+#: build/trans_presets.java:4105
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:4105
+#: build/trans_presets.java:4106
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:4109
+#: build/trans_presets.java:4110
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4111
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4116
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -32477,10 +33375,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 "Stadsgroen bewerken"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:4122
+#: build/trans_presets.java:4123
 msgid "Common"
 msgstr "Algemeen"
@@ -32488,20 +33386,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 "Algemeen bewerken"
 
 #. 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 "Park bewerken"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:4133
+#: build/trans_presets.java:4134
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -32509,5 +33407,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 "Recreatiegebied bewerken"
@@ -32515,15 +33413,15 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4142
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:4142
+#: build/trans_presets.java:4143
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4148
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -32531,10 +33429,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 "Begraafplaats bewerken"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:4155
+#: build/trans_presets.java:4156
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -32542,67 +33440,67 @@
 #. <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 "Begraafplaats bewerken"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:4164
+#: build/trans_presets.java:4165
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:4165
+#: build/trans_presets.java:4166
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:4170
+#: build/trans_presets.java:4171
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4172
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:4177
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4177
+#: build/trans_presets.java:4178
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4183
 msgid "Garages"
-msgstr ""
+msgstr "Garages"
 
 #. <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 ""
+msgstr "Garages bewerken"
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4190
+#: build/trans_presets.java:4191
 msgid "Railway land"
-msgstr ""
+msgstr "Land voor spoorweg"
 
 #. <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 ""
+msgstr "Land voor spoorweg bewerken"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4197
+#: build/trans_presets.java:4198
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4198
+#: build/trans_presets.java:4199
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -32610,61 +33508,61 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4204
+#: build/trans_presets.java:4205
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4205
+#: build/trans_presets.java:4206
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4210
+#: build/trans_presets.java:4211
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4211
+#: build/trans_presets.java:4212
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4216
+#: build/trans_presets.java:4217
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4217
+#: build/trans_presets.java:4218
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4222
+#: build/trans_presets.java:4223
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4223
+#: build/trans_presets.java:4224
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4228
+#: build/trans_presets.java:4229
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4229
+#: build/trans_presets.java:4230
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
 #. group "Annotation"
-#: build/trans_presets.java:4236
+#: build/trans_presets.java:4237
 msgid "Annotation"
-msgstr ""
+msgstr "Aantekening"
 
 #. 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
@@ -32675,5 +33573,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 "Adresinformatie bewerken"
@@ -32681,5 +33579,5 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4242
+#: build/trans_presets.java:4243
 msgid "House number"
 msgstr "Huisnummer"
@@ -32687,5 +33585,5 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4244
+#: build/trans_presets.java:4245
 msgid "House name"
 msgstr "Huisnaam"
@@ -32694,61 +33592,61 @@
 #. <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 "Straatnaam"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4246
+#: build/trans_presets.java:4247
 msgid "City name"
-msgstr "Stadsnaam"
+msgstr "Naam stad"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4247
+#: build/trans_presets.java:4248
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "Country code"
 msgstr "Landcode"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "AT"
-msgstr ""
+msgstr "AT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "CH"
-msgstr ""
+msgstr "CH"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "DE"
-msgstr ""
+msgstr "DE"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "FR"
-msgstr ""
+msgstr "FR"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "GB"
-msgstr ""
+msgstr "GB"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "IT"
-msgstr ""
+msgstr "IT"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4248
+#: build/trans_presets.java:4249
 msgid "US"
-msgstr ""
+msgstr "US"
 
 #. </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
@@ -32760,5 +33658,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 "Adresinterpolatie bewerken"
@@ -32766,35 +33664,35 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "odd"
 msgstr "oneven"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "even"
 msgstr "even"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4256
+#: build/trans_presets.java:4257
 msgid "alphabetic"
-msgstr ""
+msgstr "alfabetisch"
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4258
+#: build/trans_presets.java:4259
 msgid "Contact"
-msgstr ""
+msgstr "Contactgegevens"
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4259
+#: build/trans_presets.java:4260
 msgid "Edit Contact information"
-msgstr ""
+msgstr "Contactgegevens bewerken"
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4268
+#: build/trans_presets.java:4269
 msgid "Image"
 msgstr "Afbeelding"
@@ -32804,5 +33702,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 "Multipolygoon bewerken"
@@ -32814,5 +33712,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 "buitensegment"
@@ -32820,5 +33718,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 "binnensegment"
@@ -32826,5 +33724,5 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4286
+#: build/trans_presets.java:4287
 msgid "Boundary"
 msgstr "Begrenzing"
@@ -32835,100 +33733,105 @@
 #. 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 "Wijzig begrenzing"
+msgstr "Begrenzing bewerken"
 
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "Boundary type"
 msgstr "Type begrenzing"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "administrative"
-msgstr "administratief"
+msgstr "provincie/gemeente"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "national"
 msgstr "nationaal"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "civil"
-msgstr "burgerlijk"
+msgstr "bebouwde kom"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4295
+#: build/trans_presets.java:4296
 msgid "political"
-msgstr "politiek"
+msgstr "kiesdistrict"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4296
+#: build/trans_presets.java:4297
 msgid "Administrative level"
 msgstr "Administratief niveau"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4301
+#: build/trans_presets.java:4302
 msgid "Sub area"
 msgstr "Deeloppervlak"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4302
+#: build/trans_presets.java:4303
 msgid "Administration centre"
 msgstr "Administratief centrum"
 
+#. 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 "Verkeersbeperking"
+msgstr "Beperking afslaan"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. 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 "Verkeersbeperking bewerken"
+msgstr "Beperking afslaan bewerken"
 
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_left_turn"
-msgstr "niet linksaf"
+msgstr "niet links afslaan"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_right_turn"
-msgstr "niet rechtsaf"
+msgstr "niet rechts afslaan"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "no_u_turn"
 msgstr "niet keren"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_right_turn"
-msgstr "alleen rechtsaf"
+msgstr "alleen rechts afslaan"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_left_turn"
-msgstr "alleen linksaf"
+msgstr "alleen links afslaan"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4310
+#: build/trans_presets.java:4312
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -32937,15 +33840,15 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4315
+#: build/trans_presets.java:4317
 msgid "from way"
 msgstr "vanaf weg"
 
 #. 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 ""
+msgstr "via knoop of wegen"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4317
+#: build/trans_presets.java:4319
 msgid "to way"
 msgstr "naar weg"
@@ -32953,5 +33856,5 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4320
+#: build/trans_presets.java:4322
 msgid "Route"
 msgstr "Route"
@@ -32965,7 +33868,7 @@
 #. 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 "Wijzig route"
+msgstr "Route bewerken"
 
 #. <key key="type" value="route" />
@@ -32973,5 +33876,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 "Type route"
@@ -32979,5 +33882,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
@@ -32987,5 +33890,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 "straat"
@@ -32993,5 +33896,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 "veerboot"
@@ -32999,5 +33902,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"
@@ -33050,9 +33953,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 "voet"
@@ -33060,11 +33963,11 @@
 #. 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 "trektocht"
+msgstr "wandeltocht"
 
 #. 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
@@ -33074,7 +33977,7 @@
 #. 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 "omweg"
+msgstr "omleiding"
 
 #. item "Relations/Route" combo "Route type" display value
@@ -33086,6 +33989,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
@@ -33095,5 +33998,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 "Beschrijving symbool"
@@ -33105,6 +34008,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 "Netwerk"
@@ -33112,5 +34015,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 "Staat route"
@@ -33118,5 +34021,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 "voorgesteld"
@@ -33124,5 +34027,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 "alternatief"
@@ -33130,5 +34033,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 "tijdelijk"
@@ -33136,5 +34039,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 "verbinding"
@@ -33142,5 +34045,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 "Kleur (hex)"
@@ -33152,41 +34055,41 @@
 #. <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 "route segment"
+msgstr "segment route"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4343
+#: build/trans_presets.java:4345
 msgid "forward segment"
-msgstr "voorwaarts segment"
+msgstr "segment voorwaarts"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4344
+#: build/trans_presets.java:4346
 msgid "backward segment"
-msgstr "achterwaarts segment"
+msgstr "segment achterwaarts"
 
 #. 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 "haltepunt"
+msgstr "halte"
 
 #. 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 "voorwaarts haltepunt"
+msgstr "halte voorwaarts"
 
 #. 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 "achterwaarts haltepunt"
+msgstr "halte achterwaarts"
 
 #. </roles>
 #. item "Relations/Directional Route (North America)"
-#: build/trans_presets.java:4350
+#: build/trans_presets.java:4352
 msgid "Directional Route (North America)"
-msgstr ""
+msgstr "Route richting (Noord Amerika)"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
@@ -33198,31 +34101,31 @@
 #. 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 ""
+msgstr "Route richting bewerken (gebruikt in Noord Amerika)"
 
 #. item "Relations/Directional Route (North America)" role "east segment"
-#: build/trans_presets.java:4373
+#: build/trans_presets.java:4375
 msgid "east segment"
-msgstr ""
+msgstr "oostelijke segment"
 
 #. item "Relations/Directional Route (North America)" role "north segment"
-#: build/trans_presets.java:4374
+#: build/trans_presets.java:4376
 msgid "north segment"
-msgstr ""
+msgstr "noordelijke segment"
 
 #. item "Relations/Directional Route (North America)" role "west segment"
-#: build/trans_presets.java:4375
+#: build/trans_presets.java:4377
 msgid "west segment"
-msgstr ""
+msgstr "westelijke segment"
 
 #. item "Relations/Directional Route (North America)" role "south segment"
-#: build/trans_presets.java:4376
+#: build/trans_presets.java:4378
 msgid "south segment"
-msgstr ""
+msgstr "zuidelijke segment"
 
 #. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4382
+#: build/trans_presets.java:4384
 msgid "Route network"
 msgstr "Routenetwerk"
@@ -33230,12 +34133,12 @@
 #. <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 "Wijzig routenetwerk"
+msgstr "Routenetwerk bewerken"
 
 #. </optional>
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4392
+#: build/trans_presets.java:4394
 msgid "member"
 msgstr "lid"
@@ -33243,5 +34146,5 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4395
+#: build/trans_presets.java:4397
 msgid "Associated street"
 msgstr "Samenhangende straat"
@@ -33249,10 +34152,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 "Wijzig samenhangende straat"
+msgstr "Samenhangende straat bewerken"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4402
+#: build/trans_presets.java:4404
 msgid "house"
 msgstr "huis"
@@ -33447,6 +34350,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 "vervallen"
@@ -33478,5 +34381,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 "paard"
@@ -33631,10 +34534,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 "barrière"
@@ -33679,7 +34579,7 @@
 #. <condition k="motorroad" v="yes"/>
 #. color motorroad
-#: build/trans_style.java:412
+#: build/trans_style.java:406
 msgid "motorroad"
-msgstr ""
+msgstr "autoweg"
 
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33721,9 +34621,9 @@
 #. <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 "snelwegroute"
+msgstr "snelweg_route"
 
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33795,5 +34695,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 "diensten"
@@ -33805,7 +34705,7 @@
 #. <condition k="highway" v="ford"/>
 #. color ford
-#: build/trans_style.java:669
+#: build/trans_style.java:663
 msgid "ford"
-msgstr ""
+msgstr "doorwaadbare plek"
 
 #. <icon annotate="true" src="vehicle/ford.png"/>
@@ -33821,7 +34721,7 @@
 #. <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 ""
+msgstr "highway_platform"
 
 #. </rule>
@@ -33830,7 +34730,7 @@
 #. <condition k="highway" v="turning_circle"/>
 #. color turningcircle
-#: build/trans_style.java:687
+#: build/trans_style.java:681
 msgid "turningcircle"
-msgstr "Omkeermogelijkheid"
+msgstr "Keerlus"
 
 #. <icon src="misc/construction.png" priority="10"/>
@@ -33841,7 +34741,7 @@
 #. <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 ""
+msgstr "Toegangsweg noodhulp"
 
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33851,7 +34751,7 @@
 #. <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 "rivierbank"
+msgstr "rivieroever"
 
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -33861,5 +34761,5 @@
 #. <condition k="waterway" v="stream"/>
 #. color stream
-#: build/trans_style.java:836
+#: build/trans_style.java:830
 msgid "stream"
 msgstr "beek"
@@ -33871,5 +34771,5 @@
 #. <condition k="waterway" v="dock"/>
 #. color dock
-#: build/trans_style.java:853
+#: build/trans_style.java:847
 msgid "dock"
 msgstr "dok"
@@ -34059,17 +34959,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 "kunstmatig"
@@ -34081,7 +34981,7 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color rapids
-#: build/trans_style.java:897
+#: build/trans_style.java:891
 msgid "rapids"
-msgstr ""
+msgstr "stroomversnelling"
 
 #. <!-- it's not possible to have both line and area, line seems more likely -->
@@ -34127,9 +35027,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 "spoorwegpunt"
+
+#. <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"/>
@@ -34146,10 +35064,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 "ander spoor"
 
 #. color railover
-#: build/trans_style.java:966
+#: build/trans_style.java:981
 msgid "railover"
 msgstr "spoorovergang"
@@ -34177,7 +35095,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 "oud spoor"
@@ -34212,6 +35130,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 "luchtverbinding"
@@ -34229,5 +35147,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 "luchtverbinding_donker"
@@ -34245,5 +35163,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 "luchtverbinding_licht"
@@ -34303,8 +35221,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 "kabelbaan"
@@ -34318,5 +35236,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 "piste_eenvoudig"
@@ -34328,5 +35246,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 "piste_middelmatig"
@@ -34338,5 +35256,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 "piste_gevorderden"
@@ -34348,7 +35266,7 @@
 #. <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 ""
+msgstr "piste_expert"
 
 #. <icon src="sport/skiing.png"/>
@@ -34358,7 +35276,7 @@
 #. <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 "piste_vrijekuur"
+msgstr "piste_vrij skiën"
 
 #. <icon src="sport/skiing.png"/>
@@ -34368,5 +35286,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 "piste_beginner"
@@ -34495,15 +35413,15 @@
 #. <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 "kracht"
+msgstr "elektriciteit"
 
 #. </rule>
@@ -34512,5 +35430,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 "pijler"
@@ -34522,7 +35440,7 @@
 #. <condition k="man_made" v="pipeline"/>
 #. color pipeline
-#: build/trans_style.java:1394
+#: build/trans_style.java:1409
 msgid "pipeline"
-msgstr "pijplijn"
+msgstr "pijpleiding"
 
 #. </rule>
@@ -34636,13 +35554,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 "vrije tijd"
@@ -34654,5 +35572,5 @@
 #. <icon annotate="true" src="nautical/marina.png"/>
 #. color marina
-#: build/trans_style.java:1510
+#: build/trans_style.java:1525
 msgid "marina"
 msgstr "jachthaven"
@@ -34726,10 +35644,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 "voorziening"
@@ -34813,11 +35731,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 "voorziening_verkeer"
@@ -35153,24 +36071,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 "voorziening_licht"
@@ -35196,6 +36114,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 "licht_water"
@@ -35242,8 +36160,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 "gezondheid"
@@ -35612,34 +36530,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 "winkel"
@@ -35695,8 +36613,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"
@@ -35772,9 +36690,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 "toerisme"
@@ -35842,9 +36760,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 "historisch"
@@ -35911,9 +36829,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 "groen"
@@ -35924,5 +36842,5 @@
 #. <condition k="landuse" v="quarry"/>
 #. color quarry
-#: build/trans_style.java:2700
+#: build/trans_style.java:2715
 msgid "quarry"
 msgstr "mijnbouw"
@@ -35934,5 +36852,5 @@
 #. <condition k="landuse" v="landfill"/>
 #. color landfill
-#: build/trans_style.java:2706
+#: build/trans_style.java:2721
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -35950,7 +36868,7 @@
 #. <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 "estuarium"
+msgstr "waterbekken"
 
 #. <icon src="misc/no_icon.png"/>
@@ -35960,5 +36878,5 @@
 #. <condition k="landuse" v="forest"/>
 #. color forest
-#: build/trans_style.java:2724
+#: build/trans_style.java:2739
 msgid "forest"
 msgstr "bosbouw"
@@ -35970,7 +36888,7 @@
 #. <condition k="landuse" v="garages"/>
 #. color garages
-#: build/trans_style.java:2754
+#: build/trans_style.java:2769
 msgid "garages"
-msgstr ""
+msgstr "garages"
 
 #. <icon src="misc/landuse/garages.png"/>
@@ -35980,5 +36898,5 @@
 #. <condition k="landuse" v="farmyard"/>
 #. color farmyard
-#: build/trans_style.java:2760
+#: build/trans_style.java:2775
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -35997,5 +36915,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 "winkelcentrum"
@@ -36007,5 +36925,5 @@
 #. <condition k="landuse" v="industrial"/>
 #. color industrial
-#: build/trans_style.java:2779
+#: build/trans_style.java:2794
 msgid "industrial"
 msgstr "industrieel"
@@ -36017,5 +36935,5 @@
 #. <condition k="landuse" v="brownfield"/>
 #. color brownfield
-#: build/trans_style.java:2785
+#: build/trans_style.java:2800
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -36027,5 +36945,5 @@
 #. <condition k="landuse" v="greenfield"/>
 #. color greenfield
-#: build/trans_style.java:2791
+#: build/trans_style.java:2806
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -36037,7 +36955,7 @@
 #. <condition k="landuse" v="railway"/>
 #. color railland
-#: build/trans_style.java:2797
+#: build/trans_style.java:2812
 msgid "railland"
-msgstr "Rangeerterrein"
+msgstr "rangeerterrein"
 
 #. <icon src="misc/construction.png"/>
@@ -36080,7 +36998,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 "militair gebruik"
@@ -36092,5 +37010,5 @@
 #. <condition k="landuse" v="cemetery"/>
 #. color cemetery
-#: build/trans_style.java:2816
+#: build/trans_style.java:2831
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -36101,5 +37019,5 @@
 #. <condition k="natural" v="peak"/>
 #. color peak
-#: build/trans_style.java:2874
+#: build/trans_style.java:2889
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -36112,7 +37030,7 @@
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
 #. color glacier
-#: build/trans_style.java:2881
+#: build/trans_style.java:2896
 msgid "glacier"
-msgstr "gletsjer"
+msgstr "ijsgletsjer"
 
 #. </rule>
@@ -36122,5 +37040,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"
@@ -36162,10 +37080,10 @@
 #. <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 "Natuurlijk"
+msgstr "natuurlijk"
 
 #. </rule>
@@ -36175,5 +37093,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color scrub
-#: build/trans_style.java:2906
+#: build/trans_style.java:2921
 msgid "scrub"
 msgstr "ruig land"
@@ -36185,5 +37103,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color heath
-#: build/trans_style.java:2918
+#: build/trans_style.java:2933
 msgid "heath"
 msgstr "heide"
@@ -36195,5 +37113,5 @@
 #. <icon src="misc/landmark/trees.png"/>
 #. color woodarea
-#: build/trans_style.java:2924
+#: build/trans_style.java:2939
 msgid "woodarea"
 msgstr "houtland"
@@ -36205,5 +37123,5 @@
 #. <icon src="misc/mud.png"/>
 #. color mud
-#: build/trans_style.java:2948
+#: build/trans_style.java:2963
 msgid "mud"
 msgstr "slikgronden"
@@ -36215,5 +37133,5 @@
 #. <icon src="misc/beach.png"/>
 #. color beach
-#: build/trans_style.java:2954
+#: build/trans_style.java:2969
 msgid "beach"
 msgstr "strand"
@@ -36273,8 +37191,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 "route"
@@ -36353,12 +37271,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 "grens"
@@ -36474,11 +37392,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 "plaats"
@@ -36490,7 +37408,7 @@
 #. <condition k="tiger:reviewed" v="no"/>
 #. color tiger_data
-#: build/trans_style.java:3559
+#: build/trans_style.java:3574
 msgid "tiger_data"
-msgstr ""
+msgstr "tiger_data"
 
 #. </rule>
@@ -36524,6 +37442,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"
@@ -36555,5 +37473,5 @@
 #: build/trans_surveyor.java:29
 msgid "One Way"
-msgstr "Éénrichting"
+msgstr "Eénrichting"
 
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -36656,5 +37574,5 @@
 #: build/trans_validator.java:41
 msgid "oneway tag on a node"
-msgstr "éénrichtingstag op een knoop"
+msgstr "éénrichting-tag op een knoop"
 
 #. node : W : bridge == BOOLEAN_TRUE
@@ -36672,10 +37590,10 @@
 #: build/trans_validator.java:47
 msgid "wrong highway tag on a node"
-msgstr "gekeerde snelwegtag op een knoop"
+msgstr "verkeerde snelwegtag op een knoop"
 
 #. way  : I : highway == unclassified && name != *
 #: build/trans_validator.java:48
 msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Naamloze niet-geclassificeerde snelweg"
 
 #. way  : I : highway == secondary && ref != *
@@ -36695,5 +37613,5 @@
 #: build/trans_validator.java:53
 msgid "misspelled key name"
-msgstr "verkeerd gespelde sleutelnaam"
+msgstr "verkeerd gespelde naam van sleutel"
 
 #. The following could replace unnamed way check. Still at the moment we keep it as it is
@@ -36715,10 +37633,10 @@
 #: build/trans_validator.java:63
 msgid "separate cycleway as lane on a cycleway"
-msgstr "maak fietsbaan als strook op een fietspad"
+msgstr "maak fietspad als strook op een fietspad"
 
 #. way  : W : highway == * && barrier == *
 #: build/trans_validator.java:64
 msgid "barrier used on a way"
-msgstr "blokkade gebruikt om een weg"
+msgstr "blokkade gebruikt op een weg"
 
 #. way  : I : waterway == * && layer != *                         # waterway without layer tag
@@ -36756,17 +37674,16 @@
 #: build/trans_validator.java:82
 msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "ongewone tagcombinatie (snelweg & waterweg)"
 
 #. *    : W : highway == * && natural == *
 #: build/trans_validator.java:83
 msgid "unusual tag combination (highway & natural)"
-msgstr ""
+msgstr "ongewone tagcombinatie (snelweg & natuur)"
 
 #. <?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"
@@ -36774,130 +37691,143 @@
 #. <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 "Map met luchtfoto’s openen"
-
-#. <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 ""
+msgstr "Bing Sat"
 
 #. <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 ""
+msgstr "MapQuest Open Aerial"
 
 #. <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 ""
+msgstr "OpenStreetMap (Mapnik)"
 
 #. <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 ""
+msgstr "MapQuest OSM"
 
 #. <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 ""
+msgstr "ODBL-dekking"
 
 #. <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>
@@ -36905,29 +37835,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 "Straten 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>
@@ -36935,13 +37880,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>
@@ -36949,13 +37894,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>
@@ -36963,13 +37908,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 ""
+msgstr "OpenPT Map"
 
 #. <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>
@@ -36979,273 +37924,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 ""
+msgstr "MSR Maps Topo"
 
 #. <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 ""
+msgstr "MSR Maps Urban"
 
 #. <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 ""
+msgstr "Tsjechisch 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 ""
+msgstr "Tsjechisch 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-kaarten"
+#. <name>7th Series (OS7)</name>
+#: build/trans_wms.java:524
+msgid "7th Series (OS7)"
+msgstr "7th Series (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-kaarten (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 ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://ooc.openstreetmap.org/wms/map.php?source=os7&]]></url>
-#. <country-code>GB</country-code>
-#. </entry>
-#. <!--only for Japan-->
-#. <!--false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO)</name>
-#: build/trans_wms.java:251
-msgid "MLIT Japan (ORTHO)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO01)</name>
-#: build/trans_wms.java:258
-msgid "MLIT Japan (ORTHO01)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO02)</name>
-#: build/trans_wms.java:265
-msgid "MLIT Japan (ORTHO02)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
-#. <!--false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF-->
-#. <entry>
-#. <name>MLIT Japan (ORTHO03)</name>
-#: build/trans_wms.java:272
-msgid "MLIT Japan (ORTHO03)"
-msgstr ""
-
-#. <type>wms</type>
-#. <url><![CDATA[http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF]]></url>
-#. <country-code>JA</country-code>
-#. </entry>
+#.
 #. <!--only for Italy-->
-#. <!--false;Lodi - Italy;http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&-->
+#.
 #. <entry>
 #. <name>Lodi - Italy</name>
-#: build/trans_wms.java:280
+#: build/trans_wms.java:533
 msgid "Lodi - Italy"
 msgstr "Lodi - Italië"
 
 #. <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 "Sicilië - Italië"
 
 #. <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 ""
+msgstr "PCN 2006 - Italë"
 
 #. <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 ""
+msgstr "PNOA Spanje"
 
 #. <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 ""
+msgstr "Estse Basiskaart (Maaamet)"
 
 #. <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 ""
+msgstr "Estse Ortho (Maaamet)"
 
 #. <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 ""
+msgstr "Estse Multi (Maaamet)"
 
 #. <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 ""
+msgstr "Fugro (Denemarken)"
 
 #. <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>
@@ -37253,37 +39021,53 @@
 #. <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 ""
+msgstr "Stevns (Denemarken)"
 
 #. <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 ""
+msgstr "ScanEx IRS"
 
 #. <type>scanex</type>
@@ -37293,15 +39077,16 @@
 #. <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 ""
+msgstr "South Africa Topo (OOC)"
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
 msgid "Columbus V-900 CSV Files"
-msgstr ""
+msgstr "Columbus V-900 CSV-bestanden"
 
 #. *
@@ -37310,66 +39095,66 @@
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:61
 msgid "Show summary after import"
-msgstr ""
+msgstr "Overzicht weergeven na importeren"
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:62
 msgid "Do not zoom after import"
-msgstr ""
+msgstr "Niet inzoomen na importeren"
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:63
 msgid "Ignore hdop/vdop/pdop entries"
-msgstr ""
+msgstr "Negeren van items hdop/vdop/pdop"
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:64
 msgid "Warn on missing audio files"
-msgstr ""
+msgstr "Waarschuwen bij ontbrekende audiobestanden"
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java:65
 msgid "Warn on conversion errors"
-msgstr ""
+msgstr "Waarschuwen bij fouten in de conversie"
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:171
 msgid "Error in line "
-msgstr ""
+msgstr "Fout in regel "
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390
 msgid "Missing audio file"
-msgstr ""
+msgstr "Ontbrekend audiobestand"
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:187
 msgid "Commands"
-msgstr ""
+msgstr "Opdrachten"
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:271
 msgid "Command"
-msgstr ""
+msgstr "Opdracht"
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:359
 msgid "Processing..."
-msgstr ""
+msgstr "verwerken..."
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:375
 msgid "Aborted"
-msgstr ""
+msgstr "Afgebroken"
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:466
 msgid "Error executing the script: "
-msgstr ""
+msgstr "Fout bij uitvoeren van het script: "
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:42
 #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:43
 msgid "Command line"
-msgstr ""
+msgstr "Opdrachtregel"
 
 #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:42
 msgid "Set input focus to the command line."
-msgstr ""
+msgstr "Zet de focus voor invoer op de opdrachtregel."
 
 #: ../plugins/CommandLine/src/CommandLine/LengthAction.java:215
 msgid "Point on the start"
-msgstr ""
+msgstr "Punt bij het begin"
 
 #: ../plugins/CommandLine/src/CommandLine/LengthAction.java:217
 msgid "Point on the end"
-msgstr ""
+msgstr "Punt aan het einde"
 
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:159
@@ -37377,31 +39162,31 @@
 #, java-format
 msgid "Missing definition of new object with id {0}."
-msgstr ""
+msgstr "Ontbrekende definitie van nieuw object met ID {0}."
 
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:185
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr ""
+msgstr "Ontbrekend verplicht attribuut ''{0}'' voor <member> van relatie {1}."
 
 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:326
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr ""
+msgstr "Ongeldige waarde voor attribuut ''uid''. Kreeg ''{0}''."
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:52
 msgid "nodes"
-msgstr ""
+msgstr "knopen"
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:55
 msgid "ways"
-msgstr ""
+msgstr "wegen"
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:58
 msgid "relations"
-msgstr ""
+msgstr "relaties"
 
 #: ../plugins/CommandLine/src/CommandLine/Parameter.java:61
 msgid "OSM objects"
-msgstr ""
+msgstr "OSM-objecten"
 
 #: ../plugins/CommandLine/src/CommandLine/PointAction.java:94
@@ -37412,5 +39197,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
-msgstr ""
+msgstr "Raster van wegen maken"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -37419,24 +39204,26 @@
 "in common"
 msgstr ""
+"Vormt een raster van wegen naar de basis van twee bestaande die "
+"verschillende knopen hebben en één gedeelde"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Selecteer twee wegen met één gedeelde knoop"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Selecteer twee wegen die alleen maar één knoop delen"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
 msgid "Create a grid of ways"
-msgstr ""
+msgstr "Maak een raster van wegen"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:48
 msgid "Download Track ..."
-msgstr ""
+msgstr "Spoor downloaden ..."
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:48
 msgid "Download GPX track from openstreetmap.org"
-msgstr ""
+msgstr "Download GPX-spoor vanaf openstreetmap.org"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:84
@@ -37444,5 +39231,5 @@
 #, java-format
 msgid "Invalid URL {0}"
-msgstr ""
+msgstr "Ongeldige URL {0}"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:86
@@ -37450,5 +39237,5 @@
 #, java-format
 msgid "Error fetching URL {0}"
-msgstr ""
+msgstr "Fout bij ophalen URL {0}"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java:88
@@ -37457,10 +39244,10 @@
 #, java-format
 msgid "Error parsing data from URL {0}"
-msgstr ""
+msgstr "Fout bij ontleden gegevens van URL {0}"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:64
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:65
 msgid "Download Track"
-msgstr ""
+msgstr "Spoor downloaden"
 
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:213
@@ -37470,13 +39257,16 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:55
 msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "Privé (slechts gedeeld als anoniem, niet geordende punten)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:56
 msgid "Public (shown in trace list and as anonymous, unordered points)"
 msgstr ""
+"Publiek (weergegeven in lijst met sporen en als anoniem, niet geordende "
+"punten)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:57
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
 msgstr ""
+"Als spoor (alleen gedeeld als anoniem, geordende punten met tijdstempels)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:58
@@ -37485,4 +39275,6 @@
 "timestamps)"
 msgstr ""
+"Identificeerbaar (weergegeven in lijst met sporen en als identificeerbare, "
+"geordende punten met tijdstempels)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98
@@ -37499,30 +39291,31 @@
 msgid "Defines the visibility of your trace for other OSM users."
 msgstr ""
+"Definieert de zichtbaarheid van uw spoor voor andere gebruikers van OSM."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
 msgid "(What does that mean?)"
-msgstr ""
+msgstr "(Wat betekent dat?)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
 msgid "Please enter Description about your trace."
-msgstr ""
+msgstr "Voer een Omschrijving over uw spoor in."
 
 #. tags
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:148
 msgid "Tags (comma delimited)"
-msgstr ""
+msgstr "Tags (komma-gescheiden)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150
 msgid "Please enter tags about your trace."
-msgstr ""
+msgstr "Voer tags over uw spoor in."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:180
 #, java-format
 msgid "Selected track: {0}"
-msgstr "Geselecteerde track: {0}"
+msgstr "Geselecteerd spoor: {0}"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:184
@@ -37533,5 +39326,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:198
 msgid "Uploading trace ..."
-msgstr ""
+msgstr "Uploaden van spoor ..."
 
 #. Set progress dialog to indeterminate while connecting
@@ -37542,38 +39335,38 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:229
 msgid "Upload canceled"
-msgstr ""
+msgstr "Uploaden geannuleerd"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:242
 msgid "Error while uploading"
-msgstr "Uploaden is mislukt"
+msgstr "Fout tijdens uploaden"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:295
 msgid "GPX upload was successful"
-msgstr "GPX-track is geupload"
+msgstr "GPX-spoor is geüpload"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:296
 msgid "Upload failed. Server returned the following message: "
-msgstr "Upload is mislukt. Server gaf de volgende melding: "
+msgstr "Uploaden mislukt. Server gaf het volgende bericht terug: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr "GPX-track uploaden: {0}% ({1} van {2})"
+msgstr "GPX-spoor uploaden: {0}% ({1} van {2})"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:367
 msgid "No description provided. Please provide some description."
-msgstr "Geen beschrijving opgegeven. Voer deze s.v.p. in,"
+msgstr "Geen omschrijving gegeven. Geef een omschrijving."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:397
 msgid "Uploading GPX Track"
-msgstr "GPX-track uploaden"
+msgstr "GPX-spoor uploaden"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
 msgid "Uploads traces to openstreetmap.org"
-msgstr "Sporen naar openstreetmap.org uploaden"
+msgstr "Sporen uploaden naar openstreetmap.org"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java:38
 msgid "Shows elevation profile"
-msgstr ""
+msgstr "Geeft hoogteprofiel weer"
 
 #. Show name of profile in title
@@ -37583,30 +39376,30 @@
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:324
 msgid "Elevation Profile"
-msgstr ""
+msgstr "Hoogteprofiel"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:93
 msgid "Open the elevation profile window."
-msgstr ""
+msgstr "Open het venster voor het Hoogteprofiel."
 
 #. first row: Headlines with bold font
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:130
 msgid "Min"
-msgstr ""
+msgstr "Min."
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:133
 msgid "Avrg"
-msgstr ""
+msgstr "Gem."
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:136
 msgid "Max"
-msgstr ""
+msgstr "Max."
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:139
 msgid "Dist"
-msgstr ""
+msgstr "Afst."
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:142
 msgid "Gain"
-msgstr ""
+msgstr "Winst"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:145
@@ -37614,56 +39407,56 @@
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:26
 msgid "Time"
-msgstr ""
+msgstr "Tijd"
 
 #. Geoid
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:164
 msgid "Geoid"
-msgstr ""
+msgstr "Geoïde"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:180
 msgid "Automatic"
-msgstr ""
+msgstr "Automatisch"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:190
 msgid "Fixed value"
-msgstr ""
+msgstr "Vaste waarde"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java:118
 #, java-format
 msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "Hoogteprofiel voor spoor ''{0}''."
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java:120
 msgid "Elevation profile"
-msgstr ""
+msgstr "Hoogteprofiel"
 
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfilePanel.java:203
 msgid "(No elevation data)"
-msgstr ""
+msgstr "(Geen hoogtegegevens)"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java:81
 msgid "Can not save preferences"
-msgstr ""
+msgstr "Kan geen voorkeuren opslaan"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
 msgid "FastDraw configuration"
-msgstr ""
+msgstr "Configuratie FastDraw"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:29
 msgid "Epsilon multiplier"
-msgstr ""
+msgstr "Epsilon vermenigvuldigingsfactor"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:30
 msgid "Starting Epsilon"
-msgstr ""
+msgstr "Start Epsilon"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:31
 msgid "Max points count per 1 km"
-msgstr ""
+msgstr "Max. aantal punten per 1 km"
 
 #. I18n: Combobox to select what a press to return key does
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:32
 msgid "Enter key mode"
-msgstr ""
+msgstr "Modus Sleutel invoeren"
 
 #. JComboBox combo1=new JComboBox(new String[]{tr("Autosimplify and wait"),
@@ -37672,41 +39465,42 @@
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:39
 msgid "Autosimplify"
-msgstr ""
+msgstr "Autom. vereenvoudigen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
 msgid "Simplify with initial epsilon"
-msgstr ""
+msgstr "Vereenvoudigen met initiële epsilon"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:40
 msgid "Save as is"
-msgstr ""
+msgstr "Opslaan als is"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:41
 msgid "Snap to nodes"
-msgstr ""
+msgstr "Vangen aan knopen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:42
 msgid "Add fixed points on click"
-msgstr ""
+msgstr "Vaste punten met klikken toevoegen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:43
 msgid "Add fixed points on spacebar"
-msgstr ""
+msgstr "Vaste punten met spatiebalk toevoegen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:66
 msgid "FastDraw settings"
-msgstr ""
+msgstr "Instellingen FastDraw"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:72
 msgid "Save settings"
-msgstr ""
+msgstr "Instellingen opslaan"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:90
 msgid "Can not read settings"
-msgstr ""
+msgstr "Kan instellingen niet lezen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:57
 msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
 msgstr ""
+"Q=Opties, Enter=opslaan, Ctrl-Enter=opslaan met tags, Up/Down=fijn afstemmen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:59
@@ -37715,22 +39509,25 @@
 "to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"
 msgstr ""
+"Klik of Klik&Sleep om door te gana, Ctrl-klik om vaste knoop toe te voegen, "
+"Shift-klik om te verwijderen, Enter om te vereenvoudigen of op te slaan, "
+"Ctrl-Shift-klik om nieuwe lijn te beginnen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 msgid "FastDrawing"
-msgstr ""
+msgstr "Snel tekenen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:94
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
 msgid "Fast drawing mode"
-msgstr ""
+msgstr "modus Snel tekenen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:353
 msgid "Please move the mouse to draw new way"
-msgstr ""
+msgstr "Verplaats de muis om een nieuwe weg te tekenen"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
 #, java-format
 msgid "Are you sure you do not want to save the line containing {0} points?"
-msgstr ""
+msgstr "Weet u zeker dat u de lijn die {0} punten bevat niet wilt opslaan?"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:502
@@ -37742,50 +39539,54 @@
 "{3} points per km (average)"
 msgstr ""
+"{0} m - lengte van de lijn\n"
+"{1} knopen\n"
+"{2} punten per km (maximum)\n"
+"{3} punten per km (gemiddeld)"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
 msgid "Line information"
-msgstr ""
+msgstr "Informatie over lijn"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:589
 msgid "Cannot place node outside of the world."
-msgstr ""
+msgstr "Kan de knoop niet buiten de wereld plaatsen."
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:619
 msgid "Draw the way by mouse"
-msgstr ""
+msgstr "Teken de weg met de muis"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:650
 #, java-format
 msgid "min distance={0} px ({1} m)"
-msgstr ""
+msgstr "min. afstand={0} px ({1} m)"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:692
 msgid "Convert way to FastDraw line"
-msgstr ""
+msgstr "Converteer weg naar lijn van FastDraw"
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:702
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
-msgstr ""
+msgstr "Eps={0}, {1} punten, {2} p/km"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:28
 msgid "Fix addresses"
-msgstr ""
+msgstr "Adressen repareren"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java:29
 msgid "Show dialog with incomplete addresses"
-msgstr ""
+msgstr "Geef dialoogvenster weer met incomplete adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java:30
 msgid "Fix street addresses"
-msgstr ""
+msgstr "Straatadressen repareren"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java:31
 msgid "Find and fix addresses without (valid) streets."
-msgstr ""
+msgstr "Zoek en repareer adressen zonder (geldige) straten."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java:33
 msgid "Address Edit"
-msgstr ""
+msgstr "Adres bewerken"
 
 #. Start progress monitor to guess address values
@@ -37793,72 +39594,72 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java:195
 msgid "Searching"
-msgstr ""
+msgstr "Zoeken"
 
 #. Update progress monitor
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java:227
 msgid "Guess values for "
-msgstr ""
+msgstr "Geschatte waarden voor "
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:655
 msgid "Address has no street"
-msgstr ""
+msgstr "Adres heeft geen straat"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:664
 msgid "Address has no valid street"
-msgstr ""
+msgstr "Adres heeft gene geldige straat"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:676
 msgid "Address has no post code"
-msgstr ""
+msgstr "Adres heeft geen postcode"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:687
 msgid "Address has no city"
-msgstr ""
+msgstr "Adres heeft geen stad"
 
 #. TODO: Add guess for country
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:699
 msgid "Address has no country"
-msgstr ""
+msgstr "Adres heeft geen land"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:713
 msgid "Assign to"
-msgstr ""
+msgstr "Toewijzen aan"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java:729
 msgid "Remove all address tags"
-msgstr ""
+msgstr "Verwijder alle tags voor adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java:41
 msgid "No name"
-msgstr ""
+msgstr "Geen naam"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:70
 msgid "Unresolved Addresses"
-msgstr ""
+msgstr "Niet opgeloste adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:75
 msgid "Select and close"
-msgstr ""
+msgstr "Selecteer en sluit"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:109
 msgid "Fix unresolved addresses"
-msgstr ""
+msgstr "Repareer niet opgeloste adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:210
 msgid "Complete Addresses"
-msgstr ""
+msgstr "Complete adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:214
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:52
 msgid "Incomplete Addresses"
-msgstr ""
+msgstr "Incomplete adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:218
 msgid "Selected Addresses"
-msgstr ""
+msgstr "Geselecteerde adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:222
 msgid "Selected Street"
-msgstr ""
+msgstr "Geselecteerde straat"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:235
@@ -37867,5 +39668,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:106
 msgid "(No data)"
-msgstr ""
+msgstr "(Geen gegevens)"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:55
@@ -37873,22 +39674,22 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:137
 msgid "Segments"
-msgstr ""
+msgstr "Segmenten"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:78
 msgid "Show incomplete addresses"
-msgstr ""
+msgstr "Geef incomplete adressen weer"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:218
 msgid "items"
-msgstr ""
+msgstr "items"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java:220
 msgid "no items"
-msgstr ""
+msgstr "geen items"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
 msgid "Postcode"
-msgstr ""
+msgstr "Postcode"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
@@ -37897,33 +39698,33 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:170
 msgid "Street"
-msgstr ""
+msgstr "Straat"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:46
 msgid "Turns all guesses into the corresponding tag values."
-msgstr ""
+msgstr "Wisselt alle schattingen naar de overeenkomend waarden voor de tags."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:89
 msgid "Applied guessed values"
-msgstr ""
+msgstr "Toegepaste geschatte waarden"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:139
 msgid "Applied guessed values for "
-msgstr ""
+msgstr "Toegepaste geschatte waarden voor "
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java:35
 msgid "Assign address to street"
-msgstr ""
+msgstr "Adres toewijzen aan straat"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java:36
 msgid "Assign the selected address(es) to the selected street."
-msgstr ""
+msgstr "Wijs het/de geselecteerde adres(sen) toe aan de geselecteerde straat."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java:52
 msgid "Set street name"
-msgstr ""
+msgstr "Stel de straatnaam in"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java:25
 msgid "Convert ALL streets."
-msgstr ""
+msgstr "Converteer ALLE straten."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java:26
@@ -37932,20 +39733,22 @@
 "current layer."
 msgstr ""
+"Maak een relatie tussen straat en de gerelateerde adressen voor ALLE straten "
+"op de huidige laag."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java:32
 msgid "Convert to relation."
-msgstr ""
+msgstr "Converteer naar relatie."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java:33
 msgid "Create relation between street and related addresses."
-msgstr ""
+msgstr "Maak een relatie tussen straat en gerelateerde adressen."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java:68
 msgid "Create address relation for "
-msgstr ""
+msgstr "Maak een adresrelatie voor "
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java:41
 msgid "Guess"
-msgstr ""
+msgstr "Schatting"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java:41
@@ -37954,37 +39757,39 @@
 "according tag."
 msgstr ""
+"Probeert de adresgegevens in te schatten door de naam van het "
+"dichtstbijzijnde object met de overeenkomende tag te selecteren."
 
 #. Launch address guessing thread
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java:90
 msgid "Guessing address values"
-msgstr ""
+msgstr "Schatten van waarden voor adres"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java:26
 msgid "Removes address related tags from the object."
-msgstr ""
+msgstr "Verwijdert tags die gerelateerd zijn aan het adres uit het object."
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java:31
 msgid "Remove address tags"
-msgstr ""
+msgstr "Tags voor adres verwijderen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 msgid "Marks selected addresses in the map"
-msgstr ""
+msgstr "Markeert geselecteerde adressen op de map"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java:34
 msgid "Select incomplete addresses"
-msgstr ""
+msgstr "Selecteer incomplete adressen"
 
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java:35
 msgid "Selects all addresses with incomplete data."
-msgstr ""
+msgstr "Selecteert alle adressen met incomplete gegevens."
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 msgid "Default image projection"
-msgstr ""
+msgstr "Standaard projectie voor afbeelding"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105
 msgid "JOSM''s current projection"
-msgstr ""
+msgstr "JOSM''s huidige projectie"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:106
@@ -37996,52 +39801,60 @@
 "the image layer.)"
 msgstr ""
+"Geen projectie-bestand (.prj) gevonden.<br>U kunt de standaard projectie "
+"voor afbeeldingen ({0}) kiezen of JOSM''s huidige bewerker voor projectie "
+"({1}) als projectie voor de originele afbeelding.<br>(Die kan later "
+"gewijzigd worden in het rechtsklik-menu van de afbeeldingslaag.)"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:316
 msgid "Layer Properties"
-msgstr ""
+msgstr "Eigenschappen voor laag"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import image"
-msgstr ""
+msgstr "Afbeelding importeren"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:31
 msgid "Import georeferenced image"
-msgstr ""
+msgstr "afbeelding met geo-verwijzing  importeren"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:52
 msgid "Error while creating image layer: "
-msgstr ""
+msgstr "Fout bij maken van afbeeldingslaag: "
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:100
 msgid "ImproveWayAccuracy"
-msgstr ""
+msgstr "WegNauwkeurigheidVerbeteren"
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:101
 msgid "Improve Way Accuracy mode"
-msgstr ""
+msgstr "modus Weg nauwkeurigheid verbeteren"
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 msgid "Improve Way Accuracy"
-msgstr ""
+msgstr "Weg nauwkeurigheid verbeteren"
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:187
 msgid "Click on the way to start improving its shape."
-msgstr ""
+msgstr "Klik op de weg om te beginnen om de vorm ervan te verbeteren."
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:189
 msgid "Select a way that you want to make more accurate."
-msgstr ""
+msgstr "Selecteer een weg die u nauwkeuriger wilt maken."
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:192
 msgid "Click to move the highlighted node. Hold Ctrl to add new nodes."
 msgstr ""
+"Klik om de geaccentueerde knoop te verplaatsen. Houd Ctrl ingedrukt om de "
+"nieuwe knopen toe te voegen."
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:194
 msgid "Click to add a new node. Release Ctrl to move existing nodes."
 msgstr ""
+"Klik om een nieuwe knoop toe te voegen. Laat Ctrl los om bestaande knopen te "
+"verplaatsen."
 
 #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:352
 msgid "Cannot place a node outside of the world."
-msgstr ""
+msgstr "Kan geen knoop buiten de wereld plaatsen."
 
 #. Finishing the sequence command
@@ -38050,66 +39863,67 @@
 msgid "Add and a new node to way"
 msgid_plural "Add and a new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Voeg een nieuwe knoop toe aan weg"
+msgstr[1] "Voeg een nieuwe knoop toe aan {0} wegen"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:87
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:89
 msgid "Edit opening hours"
-msgstr ""
+msgstr "Openingstijden bewerken"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:88
 msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
+"Bewerk de tag Tijd van het geselecteerde element in een grafische interface"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:195
 msgid "edit existing tag"
-msgstr ""
+msgstr "bewerk bestaande tag"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:202
 msgid "edit new tag"
-msgstr ""
+msgstr "bewerk nieuwe tag"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:252
 msgid "Display clock in 12h mode."
-msgstr ""
+msgstr "Klok weergeven in modus 12u."
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:264
 msgid "Choose key"
-msgstr ""
+msgstr "Toets kiezen"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:87
 #, java-format
 msgid "apply {0}"
-msgstr ""
+msgstr "toepassen {0}"
 
 #. TODO focus on the valueField
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:157
 msgid "There is something wrong in the value near:"
-msgstr ""
+msgstr "Er is iets fout in de waarde nabij:"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:160
 #, java-format
 msgid "Info: {0}"
-msgstr ""
+msgstr "Info: {0}"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:161
 msgid "Correct the value manually and than press Enter."
-msgstr ""
+msgstr "Corrigeer de waarde handmatig en druk dan op Enter."
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:163
 msgid "Error in timeformat"
-msgstr ""
+msgstr "Fout in de tijdsindeling"
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
 msgid "open end"
-msgstr ""
+msgstr "open einde"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 msgid "Handy Address Interpolation Functions"
-msgstr ""
+msgstr "Handige functies voor Adres-interpolatie"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
 msgid "Define Address Interpolation"
-msgstr ""
+msgstr "Definieer Adres-interpolatie"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
@@ -38123,9 +39937,9 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Alphabetic"
-msgstr ""
+msgstr "Alfabetisch"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Numeric"
-msgstr ""
+msgstr "Numeriek"
 
 #. NOTE: The following 2 arrays must match in number of elements and position
@@ -38133,136 +39947,142 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Actual"
-msgstr ""
+msgstr "Actueel"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Estimate"
-msgstr ""
+msgstr "Schatting"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
 msgid "Potential"
-msgstr ""
+msgstr "Potentieel"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
 #, java-format
 msgid "Relation: {0}"
-msgstr ""
+msgstr "Relatie {0}"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202
 msgid "Associate with street using:"
-msgstr ""
+msgstr "Verbind met straat die gebruikt:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:213
 msgid "Numbering Scheme:"
-msgstr ""
+msgstr "Nummeringschema:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
 msgid "Increment:"
-msgstr ""
+msgstr "Stap:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
 msgid "Starting #:"
-msgstr ""
+msgstr "Beginnen met #:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221
 msgid "Ending #:"
-msgstr ""
+msgstr "Eindigen met #:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
 msgid "Accuracy:"
-msgstr ""
+msgstr "Nauwkeurigheid:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
 msgid "Convert way to individual house numbers."
-msgstr ""
+msgstr "Converteer weg naar individuele huisnummers."
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:308
 #, java-format
 msgid "Will associate {0} additional house number nodes"
-msgstr ""
+msgstr "Zal {0} aanvullende knopen met huisnummers verbinden"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:460
 msgid "City:"
-msgstr ""
+msgstr "Stad:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:461
 msgid "State:"
-msgstr ""
+msgstr "Staat:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:462
 msgid "Post Code:"
-msgstr ""
+msgstr "Postcode:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:463
 msgid "Country:"
-msgstr ""
+msgstr "Land:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:464
 msgid "Full Address:"
-msgstr ""
+msgstr "Volledige adres:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:499
 msgid "Optional Information:"
-msgstr ""
+msgstr "Optionele informatie:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:684
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
+"Selecteer een straat die moet worden verbonden met de weg van de "
+"adresinterpolatie"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:697
 msgid "Please select address interpolation way for this street"
-msgstr ""
+msgstr "Selecteer een weg met adresinterpolatie voor deze straat"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1085
 msgid "Expected odd numbers for addresses"
-msgstr ""
+msgstr "Verwachtte oneven nummers voor adressen"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1090
 msgid "Expected even numbers for addresses"
-msgstr ""
+msgstr "Verwachtte even nummers voor adressen"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1100
 msgid "Expected valid number for address increment"
-msgstr ""
+msgstr "Verwachtte geldig nummer voor verhogen van adres"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1113
 msgid "Country code must be 2 letters"
-msgstr ""
+msgstr "Landcode moet 2 letters zijn"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1285
 msgid "Please enter valid number for starting and ending address"
-msgstr ""
+msgstr "Voer een geldig nummer in voor adres aa begin en eind"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1303
 msgid "Alphabetic address must end with a letter"
-msgstr ""
+msgstr "Alfabetische adressen moeten eindigen met een letter"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1318
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
+msgstr "Begin- en eindnummers moeten hetzelfde zijn voor alfabetische adressen"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1324
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
+"De letter van het adres aan het begin moet lager zijn dan de letter van het "
+"adres aan het einde"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1340
 msgid "Please enter valid number for starting address"
-msgstr ""
+msgstr "Voer een geldig nummer in voor het adres aan het begin"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Please enter valid number for ending address"
-msgstr ""
+msgstr "Voer een geldig nummer in voor het adres aan het einde"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1350
 msgid "Starting address number must be less than ending address number"
 msgstr ""
+"Het nummer van het adres aan het begin moet lager zijn dan het nummer van "
+"het adres aan het einde"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:32
 msgid "Align Way Segments"
-msgstr ""
+msgstr "Wegsegmenten uitlijnen"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:36
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 msgid "Align Ways"
-msgstr ""
+msgstr "Wegen uitlijnen"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:76
@@ -38271,17 +40091,19 @@
 " or put the pivot on their common node.\n"
 msgstr ""
+"Selecteer twee segmenten die gene knopen delen\n"
+" of plaats het draaipunt op hun gedeelde knoop.\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:89
 msgid "AlignWayS: Alignment not possible"
-msgstr ""
+msgstr "AlignWayS: niet mogelijk om uit te lijnen"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:88
 msgid "Aligning would result nodes outside the world.\n"
-msgstr ""
+msgstr "Uitlijnen zou er toe leiden dat knopen buiten de wereld liggen.\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:169
 msgid "I''m ready!"
-msgstr ""
+msgstr "Ik ben klaar!"
 
 #. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
@@ -38289,13 +40111,13 @@
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:173
 msgid "AlignWays Tips"
-msgstr ""
+msgstr "Tips voor AlignWays"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
 msgid "Align Ways mode"
-msgstr ""
+msgstr "modus Wegen uitlijnen"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:173
 msgid "Align way segment"
-msgstr ""
+msgstr "Wegsegment uitlijnen"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
@@ -38310,9 +40132,12 @@
 "Please choose a different segment to be aligned."
 msgstr ""
+"Segment dat moet worden uitgelijnd mag niet hetzelfde zijn als het segment "
+"waar naar verwezen wordt.\n"
+"Kies een ander segment dat moet worden uitgelijnd."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
 msgid "AlignWayS message"
-msgstr ""
+msgstr "bericht AlignWayS"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
@@ -38321,4 +40146,7 @@
 "Please choose a different reference segment."
 msgstr ""
+"Segment waarnaar wordt verwezen mag niet hetzelfde zijn als segment dat moet "
+"worden uitgelijnd.\n"
+"Kies een ander segment om naar te verwijzen."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:55
@@ -38331,4 +40159,10 @@
 "<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
 msgstr ""
+"Welkom bij de plug-in </span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> <br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...die eigenlijk zou moeten heten: plug-in <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egmenten)</span> ..."
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:82
@@ -38345,4 +40179,14 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays zal u "
+"helpen om twee wegsegmenten uit te lijnen. Dit kan handig zijn als u "
+"bijvoorbeeld de contouren van ene gebouw schetst en wilt dat de kant er van "
+"parallel is aan de straat of weg.<br>\n"
+"<br>\n"
+"Sommige tips kunnen u helpen vóór u begint:\n"
+"</p>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -38361,4 +40205,15 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Selecteer een segment als verwijzing.</b> U kunt dit doen door "
+"<b><i><span style=\"color:green\">Ctrl-klik</span></i></b>ing\n"
+"op een segment te doen. Het andere, uit te lijnen segment zal parallel komen "
+"aan dit. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -38379,4 +40234,17 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Selecteer het uit te lijnen segment.</b> U kunt dit doen door "
+"eenvoudig te <b><i><span style=\"color:green\">klik</span></i></b>ken op een "
+"ander segment. \n"
+"Het draaipunt zal standaard worden geaccentueerd in het midden van het "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -38397,4 +40265,17 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optioneel <b>wijzig het draaipunt</b>. Om parallel te komen aan het "
+"segment waarnaar wordt verwezen, zal het uit te lijnen segment draaien "
+"rondom dit punt. U kunt de twee uitersten of het centrum van het segment "
+"kiezen door daar nabij te <b><i><span style=\"color:green\">klik</span></i></"
+"b>ken. \n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #. NOI18N
@@ -38414,4 +40295,16 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Uitlijnen van de segmenten.</b> Druk op <b><i><span style=\"color:"
+"green\">{0}</span></i></b>. Als alternatief vindt u de opdracht in het menu "
+"<b>Gereedschappen</b>\n"
+" of wilt u de actie misschien plaatsen op de <b>werkbalk</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:106
@@ -38426,8 +40319,16 @@
 "\n"
 msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Laatste hint:</b> Er is een eenvoudige manier om opnieuw te beginnen met "
+"uw selecties als u dat wilt: <b><i><span style=\"color:green\">Alt-klik</"
+"span></i></b> ergens op de kaart.\n"
+"</div>\n"
+"</html>\n"
+"\n"
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:140
 msgid "Don''t show this again"
-msgstr ""
+msgstr "Dit niet meer weergeven"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:20
@@ -38437,21 +40338,21 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:22
 msgid "House number:"
-msgstr ""
+msgstr "Huisnummer:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:23
 msgid "Street Name:"
-msgstr ""
+msgstr "Straatnaam:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:27
 msgid "Increment"
-msgstr ""
+msgstr "Verhogen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:28
 msgid "Decrement"
-msgstr ""
+msgstr "Verlagen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:30
 msgid "Numbers:"
-msgstr ""
+msgstr "Nummers:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:17
@@ -38461,25 +40362,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:18
 msgid "Rotate crosshair"
-msgstr ""
+msgstr "Kruisdraad roteren"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
 msgid "Use address nodes under buildings"
-msgstr ""
+msgstr "Gebruik adresknopen onder gebouwen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:22
 msgid "Advanced settings"
-msgstr ""
+msgstr "Gevorderde instellingen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Buildings tags:"
-msgstr ""
+msgstr "Tags voor gebouwen:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:278
 msgid "Cannot place building outside of the world."
-msgstr ""
+msgstr "Kan geen gebouw buiten de wereld plaatsen."
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:320
 msgid "Create building"
-msgstr ""
+msgstr "Gebouw maken"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
@@ -38487,54 +40388,54 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
 msgid "Set buildings size"
-msgstr ""
+msgstr "Grootte gebouw instellen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:20
 msgid "Use Address dialog"
-msgstr ""
+msgstr "Dialoogvenster Adres gebruiken"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:21
 msgid "Auto-select building"
-msgstr ""
+msgstr "Gebouw automatisch selecteren"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
 msgid "Buildings width:"
-msgstr ""
+msgstr "Breedte gebouw:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Length step:"
-msgstr ""
+msgstr "Lengte stap:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:36
 msgid "Advanced..."
-msgstr ""
+msgstr "Gevorderd..."
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:66
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
 msgid "Draw buildings"
-msgstr ""
+msgstr "Gebouwen tekenen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:387
 msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Punt op de hoek van het gebouw om te beginnen met tekenen"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:389
 msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Punt aan het tegenoverliggende einde van het gebouw"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:391
 msgid "Set width of the building"
-msgstr ""
+msgstr "Stel de breedte van het gebouw in"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 msgid "on polygon"
-msgstr ""
+msgstr "op polygoon"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
 msgid "Add address"
-msgstr ""
+msgstr "Adres toevoegen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
 msgid "Helping tool for tag address"
-msgstr ""
+msgstr "Hulpgereedschap om adressen te taggen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
@@ -38544,9 +40445,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:447
 msgid "Next no"
-msgstr ""
+msgstr "Volgend nr"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:489
 msgid "Enter addresses"
-msgstr ""
+msgstr "Adressen invoeren"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:101
@@ -38557,4 +40458,7 @@
 "(No = new cache)"
 msgstr ""
+"Locatie \"{0}\" gevonden in cache.\n"
+"Cache eerst laden ?\n"
+"(Nee = nieuwe cache)"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -38564,5 +40468,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:441
 msgid "Select Feuille"
-msgstr ""
+msgstr "Selecteer kaart"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150
@@ -38571,4 +40475,6 @@
 "Probably an old version of the cache file."
 msgstr ""
+"Fout bij laden van bestand\n"
+"Waarschijnlijk een oude versie van het cache-bestand."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
@@ -38578,5 +40484,5 @@
 #, java-format
 msgid "Lambert Zone {0} cache file (.{0})"
-msgstr ""
+msgstr "Lambert Zone {0} cache-bestand (.{0})"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
@@ -38591,21 +40497,21 @@
 #, java-format
 msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
-msgstr ""
+msgstr "Lambert CC9 Zone {0} cache-bestand (.CC{0})"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
 msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
-msgstr ""
+msgstr "Guadeloupe Fort-Marigot cache-bestand (.UTM1)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
 msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
-msgstr ""
+msgstr "Guadeloupe Ste-Anne cache-bestand (.UTM2)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
 msgid "Martinique Fort Desaix cache file (.UTM3)"
-msgstr ""
+msgstr "Martinique Fort Desaix cache-bestand (.UTM3)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr ""
+msgstr "Reunion RGR92 cache-bestand (.UTM4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -38613,5 +40519,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:170
 msgid "CadastreGrabber: Illegal url."
-msgstr "CadastreGrabber: ongeldige URL."
+msgstr "CadastreGrabber: Ongeldige URL."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:85
@@ -38620,4 +40526,6 @@
 "Server in maintenance or temporary overloaded."
 msgstr ""
+"Kan geen nieuwe cliëntsessie openen.\n"
+"Server in onderhoud of tijdelijk overbelast."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:93
@@ -38627,4 +40535,5 @@
 "or action canceled"
 msgstr ""
+"Stad (groot)/stad {0} niet gevonden of niet beschikbaar of actie geannuleerd"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:410
@@ -38652,12 +40561,17 @@
 "Would you like to restore F11 for grab action?"
 msgstr ""
+"Plug-in cadastre-fr gebruikte traditioneel de sneltoets F11 voor het "
+"ophalen,\n"
+"welke momenteel standaard is toegewezen voor het schakelen naar/van volledig "
+"scherm.\n"
+"Wilt u F11 terugzetten naar de actie voor het ophalen?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:280
 msgid "Restore grab shortcut F11"
-msgstr ""
+msgstr "Sneltoets F11 terugzetten naar ophalen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:285
 msgid "JOSM is stopped for the change to take effect."
-msgstr ""
+msgstr "JOSM is afgesloten om de wijziging effect te laten hebben."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:347
@@ -38667,4 +40581,7 @@
 "Layers ''Building'' and ''Parcel'' added by default."
 msgstr ""
+"Schakel ten minste twee WMS-lagen in in de configuratie van de cadastre-fr "
+"plugin.\n"
+"De lagen ''Building'' en ''Parcel'' worden standaard toegevoegd."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:408
@@ -38673,4 +40590,6 @@
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
+"Waarschuwing: dialoogvenster Opties altijd vooraan plaatsen is mislukt. "
+"Uitzondering was: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -38688,70 +40607,71 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
 msgid "Draw boundaries of downloaded data."
-msgstr "Grenzen van gedownloade gegevens tekenen"
+msgstr "Grenzen van gedownloade gegevens tekenen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290
 msgid "Disable image cropping during georeferencing."
-msgstr ""
+msgstr "Schakel bijsnijden van afbeeldingen uit tijdens geo-verwijzingen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Gebruik van \"Tableau d''assemblage\""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
 msgid "Select first WMS layer in list."
-msgstr ""
+msgstr "Selecteer de eerste WMS-laag uit de lijst."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
 msgstr ""
+"Gebruik geen relatie voor adressen (maar \"addr:street\" voor elementen)."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
 msgid "off"
-msgstr ""
+msgstr "uit"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
 msgid "25 m"
-msgstr ""
+msgstr "25 m"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
 msgid "50 m"
-msgstr ""
+msgstr "50 m"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
 msgid "100 m"
-msgstr ""
+msgstr "100 m"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
 msgid "high"
-msgstr ""
+msgstr "hoog"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 msgid "medium"
-msgstr ""
+msgstr "medium"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid "symbol"
-msgstr ""
+msgstr "symbool"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
 msgid "parcel"
-msgstr ""
+msgstr "perceel"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "parcel number"
-msgstr ""
+msgstr "perceelnummer"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
 msgid "locality"
-msgstr ""
+msgstr "plaats"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
 msgid "section"
-msgstr ""
+msgstr "sectie"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "commune"
-msgstr ""
+msgstr "gemeente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
@@ -38762,5 +40682,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
 msgid "Max. cache size (in MB)"
-msgstr "Max. buffergrootte (in MB)"
+msgstr "Max. grootte cache (in MB)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
@@ -38773,4 +40693,9 @@
 "by this plugin."
 msgstr ""
+"Een speciale afhandeling voor het Franse kadaster wms op www.cadastre.gouv."
+"fr<BR><BR>Lees de Terms and Conditions of Use hier (in het Frans): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr."
+"html\"> http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr."
+"html</a> <BR>vóórdat een upload van gegevens wordt gemaakt door deze plug-in."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
@@ -38781,5 +40706,5 @@
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
-"<html>Waarde van de sleutel \"source\" als automatisch voeden is "
+"<html>Waarde van de sleutel \"source\" als automatisch vullen is "
 "ingeschakeld</html>"
 
@@ -38789,4 +40714,6 @@
 "JOSM preferences."
 msgstr ""
+"Vervang de originele witte achtergrond door de  achtergrondkleur die is "
+"gedefinieerd in de voorkeuren van JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -38795,6 +40722,6 @@
 "Useful for texts on dark backgrounds."
 msgstr ""
-"Draai zwart en wit om (en alle tussenliggende grijskleuren). Nuttig voor "
-"tekst op donkere achtergronden."
+"Draai de originele zwarte en witte kleuren om (en alle tussenliggende "
+"grijze). Handig voor teksten op donkere achtergronden."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131
@@ -38805,53 +40732,54 @@
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
-"Transparantie van WMS-lagen instellen. Rechts is ondoorzichtig en links "
-"doorzichtig."
+"Instellen van transparantie voor WMS-lagen. Rechts is ondoorzichtig, links "
+"is doorzichtig."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen."
+msgstr ""
+"Een rechthoek tekenen rondom de gedownloade gegevens van de WMS-server."
 
 #. option to select the single grabbed image resolution
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
 msgid "Image resolution:"
-msgstr ""
+msgstr "Resolutie van de afbeelding:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
 msgid "High resolution (1000x800)"
-msgstr ""
+msgstr "Hoge resolutie (1000x800)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163
 msgid "Medium resolution (800x600)"
-msgstr ""
+msgstr "Medium resolutie (800x600)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165
 msgid "Low resolution (600x400)"
-msgstr ""
+msgstr "Lage resolutie (600x400)"
 
 #. option to select image zooming interpolation method
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
 msgid "Image filter interpolation:"
-msgstr ""
+msgstr "Interpolatie voor afbeeldingsfilter:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr ""
+msgstr "Dichtstbijzijnde buur (snelste) [ Standaard ]"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184
 msgid "Bilinear (fast)"
-msgstr ""
+msgstr "Bi-lineair (snel)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
 msgid "Bicubic (slow)"
-msgstr ""
+msgstr "Bi-kubisch (traag)"
 
 #. the vectorized images multiplier
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199
 msgid "Vector images grab multiplier:"
-msgstr ""
+msgstr "Vermenigvuldigingsfactor ophalen vectorafbeeldingen:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
 msgid "Grab one image full screen"
-msgstr ""
+msgstr "Eén afbeelding volledig scherm ophalen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
@@ -38859,18 +40787,18 @@
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
-"Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)"
+"Kleinere afbeeldingen ophalen (hogere kwaliteit, maar gebruikt meer geheugen)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
 msgid "Fixed size square (default is 100m)"
-msgstr "Vaste vierkant groote (standaard is 100m)"
+msgstr "Vaste vierkant grootte (standaard is 100m)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "Vaste groote (van 25 tot 1000 meter)"
+msgstr "Vaste grootte (van 25 tot 1000 meter)"
 
 #. WMS layers selection
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248
 msgid "Layers:"
-msgstr ""
+msgstr "Lagen:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251
@@ -38880,37 +40808,37 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254
 msgid "Buildings, covers, underground constructions."
-msgstr ""
+msgstr "Gebouwen, overkappingen, ondergrondse  constructies."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257
 msgid "Symbols like cristian cross."
-msgstr ""
+msgstr "Symbolen zoals christelijke kruisen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260
 msgid "Parcels."
-msgstr ""
+msgstr "Percelen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263
 msgid "Parcels numbers, street names."
-msgstr ""
+msgstr "Perceelnummers, straatnamen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266
 msgid "Address, houses numbers."
-msgstr ""
+msgstr "Adres, huisnummers."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269
 msgid "Locality, hamlet, place."
-msgstr ""
+msgstr "Plaatsen, gehucht, plek."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272
 msgid "Cadastral sections and subsections."
-msgstr ""
+msgstr "Kadastrale secties en sub-secties."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275
 msgid "Municipality administrative borders."
-msgstr ""
+msgstr "Provincie -of gemeentegrenzen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283
 msgid "Raster images grab multiplier:"
-msgstr ""
+msgstr "Vermenigvuldigingsfactor voor raster voor ophalen van afbeeldingen:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294
@@ -38918,13 +40846,15 @@
 "Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
+"Voeg het \"Tableau(x) d''assemblage\" toe aan de lijst van kadastrale bladen "
+"om op te halen."
 
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297
 msgid "Display crosspieces:"
-msgstr ""
+msgstr "Hulplijnen weergeven:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
 msgid "Allows an automatic caching"
-msgstr ""
+msgstr "Maakt automatisch cachen mogelijk"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
@@ -38939,8 +40869,10 @@
 "grabbing."
 msgstr ""
+"Selecteert automatisch de eerste WMS-laag als er meerdere lagen bestaan voor "
+"het ophalen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348
 msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr ""
+msgstr "Schakel dit in om de tag \"add:street\" voor knopen te gebruiken."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -38973,10 +40905,10 @@
 msgstr ""
 "Om overbelasting van Cadastre-WMS te vermijden,\n"
-"is importeergrootte beperkt tot maximaal 1 km2."
+"is de grootte voor importeren beperkt tot maximaal 1 km²."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:275
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:220
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr "Schakel auto-sourcing in en controleer cadastre millesime."
+msgstr "Schakel automatisch vullen in en controleer het cadastre millesime."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
@@ -38990,13 +40922,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:133
 msgid "Create boundary"
-msgstr "Kader aanmaken"
+msgstr "Begrenzing maken"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
-msgstr ""
+msgstr "Contact opnemen met cadastre WMS ..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:39
 msgid "Image already loaded"
-msgstr ""
+msgstr "Afbeelding al geladen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:75
@@ -39005,4 +40937,6 @@
 "Use the normal Cadastre Grab menu."
 msgstr ""
+"Gemeente gemaakt in vectoren !\n"
+"Gebruik het normale menu Cadastre Grab."
 
 #. set raster image commune bounding box based on current view (before adjustment)
@@ -39012,4 +40946,7 @@
 "Please use the other menu entry to georeference a \"Plan image\""
 msgstr ""
+"Deze gemeente is niet gemaakt in vectoren.\n"
+"Gebruik het andere menuitem om geo-verwijzingen te maken voor een \"Plan "
+"image\""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
@@ -39019,27 +40956,27 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 msgid "Only on vectorized layers"
-msgstr "Alleen op gevectoriseerde lagen"
+msgstr "Alleen voor lagen met vectoren"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:13
 msgid "Cancel current grab"
-msgstr ""
+msgstr "Huidige ophalen annuleren"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionCancelGrab.java:18
 msgid "Cancel current grab (only vector images)"
-msgstr ""
+msgstr "Huidige ophalen annuleren (alleen vectorafbeeldingen)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
 msgid "Cadastre grab"
-msgstr ""
+msgstr "Kadaster ophalen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 msgid "Download Image from French Cadastre WMS"
-msgstr ""
+msgstr "Download afbeelding vanaf Franse Cadastre WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
-msgstr "Cadastre: {0}"
+msgstr "Kadaster: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:39
@@ -39050,16 +40987,18 @@
 "projections and retry"
 msgstr ""
+"Wijzig de huidige projectie naar een van de kadastrale\n"
+"projecties en probeer opnieuw om de plug-in cadastre WMS in te schakelen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:34
 msgid "Georeference an image"
-msgstr ""
+msgstr "Geo-verwijzingen naar een afbeelding"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:56
 msgid "Grab non-georeferenced image"
-msgstr ""
+msgstr "Ophalen van een afbeelding zonder geo-verwijzingen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:80
 msgid "Georeferencing interrupted"
-msgstr ""
+msgstr "Geo-verwijzingen onderbroken"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116
@@ -39068,4 +41007,6 @@
 "Do you want to use them ?"
 msgstr ""
+"Deze afbeelding bevat gegevens over geo-verwijzingen\n"
+"Wilt u die gebruiken ?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
@@ -39074,13 +41015,14 @@
 "(two points required)"
 msgstr ""
+"Klik op de eerste hoek om de afbeelding bij te snijden (twee punten vereist)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:207
 msgid "Image cropping"
-msgstr ""
+msgstr "Afbeelding bijsnijden"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:206
 msgid "Click second corner for image cropping"
-msgstr ""
+msgstr "Klik op de tweede hoek voor het bijsnijden van de afbeelding"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:226
@@ -39089,13 +41031,15 @@
 "(two points required)"
 msgstr ""
+"Klik op de eerste hulplijn voor Lambert voor geo-verwijzingen (twee punten "
+"vereist"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
 msgid "Image georeferencing"
-msgstr ""
+msgstr "Geo-verwijzingen voor afbeelding"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
 msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
+msgstr "Klik op de tweede hulplijn voor Lambert voor geo-verwijzingen"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:276
@@ -39103,39 +41047,39 @@
 "Do you want to cancel completely\n"
 "or just retry "
-msgstr ""
+msgstr "Wilt u volledig annuleren of slechts opnieuw proberen "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:293
 msgid "Enter cadastre east,north position"
-msgstr ""
+msgstr "Voer de kadastrale oost,noord-positie in"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:295
 msgid "(Warning: verify north with arrow !!)"
-msgstr ""
+msgstr "(Waarschuwing: controleer noord met de pijl !!)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
 msgid "East"
-msgstr ""
+msgstr "Oost"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:309
 msgid "I use the mouse"
-msgstr ""
+msgstr "Ik gebruik de muis"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:319
 #, java-format
 msgid "Set {0} Lambert coordinates"
-msgstr ""
+msgstr "Stel {0} Lambert-coördinaten in"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:22
 msgid "Load layer from cache"
-msgstr ""
+msgstr "Laag laden vanuit cache"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:25
 msgid "Load location from cache (only if cache is enabled)"
-msgstr "Locatie uit buffer laden (alleen als buffer ingeschakeld is)"
+msgstr "Locatie uit cache laden (alleen als cache ingeschakeld is)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:45
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
+msgstr "{0} niet toegestaan met de huidige projectie"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:58
@@ -39144,4 +41088,6 @@
 "Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
+"Kan cache {0} die niet compatibel is met de huidige zone voor de projectie "
+"niet laden"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:64
@@ -39150,13 +41096,15 @@
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
+"Geselecteerd bestand {0} is geen cache-bestand van deze plug-in (ongeldige "
+"extensie)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:71
 #, java-format
 msgid "The location {0} is already on screen. Cache not loaded."
-msgstr ""
+msgstr "De locatie {0} staat al op het scherm. Cache niet geladen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
 msgid "(optional)"
-msgstr ""
+msgstr "(optioneel)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -39166,13 +41114,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
 msgid "Set a new location for the next request"
-msgstr "Een nieuwe locatie voor het volgende verzoek instellen"
+msgstr "Stel een nieuwe locatie voor het volgende verzoek in"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:67
 msgid "Add a new municipality layer"
-msgstr ""
+msgstr "Voeg een nieuwe laag in voor de gemeente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:69
 msgid "Commune"
-msgstr ""
+msgstr "Gemeente"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:71
@@ -39181,14 +41129,14 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
-"<html>Geef de dorps- of stadsnaam op.<br>Gebruik de syntax en interpunctie "
-"die bekend is bij www.cadastre.gouv.fr .</html>"
+"<html>Geef de naam voor dorp of stad op.<br>Gebruik de syntaxis en "
+"interpunctie die bekend is bij www.cadastre.gouv.fr .</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:73
 msgid "Departement"
-msgstr ""
+msgstr "Departement"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:78
 msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html>Nummer departement (optioneel)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:98
@@ -39202,17 +41150,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Get a new cookie (session timeout)"
-msgstr "Een nieuwe cookie ontvangen (sessie verlopen)"
+msgstr "Een nieuwe cookie verkrijgen (sessie verlopen)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:21
 msgid "Save image as PNG"
-msgstr ""
+msgstr "Afbeelding opslaan als PNG"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:38
 msgid "PNG files (*.png)"
-msgstr ""
+msgstr "PNG-bestanden (*.png)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:46
 msgid "Export as PNG format (only raster images)"
-msgstr ""
+msgstr "Exporteren als PNG-indeling (alleen rasterafbeeldingen)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:39
@@ -39222,5 +41170,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:40
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr ""
+msgstr "Pas de positie van de WMS-laag aan (alleen raster-afbeeldingen)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:68
@@ -39229,4 +41177,6 @@
 "a cadastre \"plan image\" (raster image)"
 msgstr ""
+"Deze modus werkt alleen als de actieve laag een kadastrale \"plan image\" is "
+"(raster-afbeelding)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47
@@ -39245,19 +41195,19 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:235
 msgid "Is not vectorized."
-msgstr "Is niet gevectoriseerd."
+msgstr "Is niet in vectoren gemaakt."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:236
 #, java-format
 msgid "Raster size: {0}"
-msgstr ""
+msgstr "Rastergrootte: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:238
 msgid "Is vectorized."
-msgstr "Is gevectoriseerd."
+msgstr "Is gemaakt in vectoren."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:239
 #, java-format
 msgid "Commune bbox: {0}"
-msgstr "Omvattende reschthoek gemeente: {0}"
+msgstr "Omvattende rechthoek gemeente: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:450
@@ -39267,19 +41217,19 @@
 "Create a new one."
 msgstr ""
-"Niet-ondersteunde versie bufferbestand; {0} gevonden, {1} verwacht.\n"
-"Maak een nieuwe aan."
+"Niet-ondersteunde versie cachebestand; {0} gevonden, {1} verwacht.\n"
+"Maak een nieuw aan."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:451
 msgid "Cache Format Error"
-msgstr "Fout in bufferstructuur"
+msgstr "Fout in structuur van cache"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:475
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
+msgstr "Lambert-zone {0} in cache niet compatibel met huidige Lambert-zone {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:477
 msgid "Cache Lambert Zone Error"
-msgstr "Fout in buffer Lambert-zone"
+msgstr "Fout in cache Lambert-zone"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
@@ -39302,18 +41252,18 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
-msgstr "Het geselecteerde schema uit de lijst gebruiken."
+msgstr "Gebruik het geselecteerde schema uit de lijst."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
-msgstr "De huidige kleuren als nieuw kleurenschema gebruiken."
+msgstr "Gebruik de huidige kleuren als nieuw kleurenschema."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
-msgstr "Het geselecteerde schema uit de lijst verwijderen."
+msgstr "Verwijder het geselecteerde schema uit de lijst."
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
-msgstr "Kleurenschema’s"
+msgstr "Kleurenschema's"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:21
@@ -39321,9 +41271,9 @@
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java:41
 msgid "Conflation"
-msgstr ""
+msgstr "Conflation"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:21
 msgid "Conflation tool for merging data"
-msgstr ""
+msgstr "Gereedschap voor het samenvoegen van gegevens"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:37
@@ -39332,53 +41282,57 @@
 "layer and try again."
 msgstr ""
+"Er zijn geen gegevenslagen aanwezig. Open of maak ten minste één "
+"gegevenslaag en probeer opnieuw."
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:39
 msgid "Cannot perform conflation"
-msgstr ""
+msgstr "Kan samenvoegen niet uitvoeren"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationLayer.java:43
 msgid "Conflation symbols"
-msgstr ""
+msgstr "Symbolen voor samenvoegen"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:28
 msgid "Conflation Options"
-msgstr ""
+msgstr "Opties voor samenvoegen"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:55
 msgid "Close the dialog, do not perform conflation"
-msgstr ""
+msgstr "Dialoogvenster sluiten, niet samenvoegen"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:600
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:632
 msgid "No valid OSM data layer present."
-msgstr ""
+msgstr "Geen geldige OSM gegevenslaag aanwezig."
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:601
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:633
 msgid "Error freezing selection"
-msgstr ""
+msgstr "Fout bij bevriezen van selectie"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:606
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:638
 msgid "Nothing is selected, please try again."
-msgstr ""
+msgstr "Niets geselecteerd, probeer opnieuw."
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:607
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:639
 msgid "Empty selection"
-msgstr ""
+msgstr "Lege selectie"
 
 #: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:670
 msgid "Unresolved differences remain, please fix remaining differences."
 msgstr ""
+"Er zijn nog niet opgeloste verschillen, repareer de niet opgeloste "
+"verschillen."
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:40
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:44
 msgid "Split area"
-msgstr ""
+msgstr "Gebied splitsen"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:42
 msgid "Splits an area by an untagged way."
-msgstr ""
+msgstr "Splits een gebied bij een niet-getagde weg."
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
@@ -39388,8 +41342,11 @@
 "Remove the area from the relation before splitting it."
 msgstr ""
+"Het geselecteerde gebied kan niet worden gesplitst, omdat het een lid is van "
+"een relatie.\n"
+"Verwijder het gebied uit de relatie vóór het te splitsen."
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:37
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "TangoGPS-bestanden (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
@@ -39399,64 +41356,64 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Format errors: "
-msgstr ""
+msgstr "Indelingsfouten: "
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
 msgid "TangoGPS import success"
-msgstr ""
+msgstr "TangoGPS met succes geïmporteerd"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
 msgid "TangoGPS import failure!"
-msgstr ""
+msgstr "TangoGPS importeren mislukt!"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
-msgstr ""
+msgstr "TCX-bestanden (*.tcx)"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
 msgid "Download along..."
-msgstr ""
+msgstr "Downloaden langs..."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
 msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "Download OSM-gegevens langs de geselecteerde wegen."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
 msgid "Download Along"
-msgstr ""
+msgstr "Downloaden langs"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
 msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "Selecteer 1 of meer wegen om langs te downloaden"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} tussenliggende knopen te downloaden."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
 #, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr ""
+msgstr "tussen {0} {1} en {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
 #, java-format
 msgid "  adding {0} {1}"
-msgstr ""
+msgstr "  toevoegen {0} {1}"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "Laag voor bewerken van GPX-sporen"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "Converteren naar GPX-laag met anonieme tijd"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java:161
 msgid "EditGpx"
-msgstr ""
+msgstr "EditGpx"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
-msgstr ""
+msgstr "GPX-sporen bewerken"
 
 #. TODO what is icon at the end?
@@ -39471,5 +41428,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:277
 msgid "Drop existing path"
-msgstr "Bestaand pad laten vallen"
+msgstr "Bestaand pad verwijderen"
 
 #. no gps layer
@@ -39483,21 +41440,21 @@
 #: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:59
 msgid "dx"
-msgstr ""
+msgstr "dx"
 
 #: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:63
 msgid "dy"
-msgstr ""
+msgstr "dy"
 
 #: ../plugins/epsg31287/src/org/openstreetmap/josm/plugins/epsg31287/ProjectionEPSG31287.java:142
 msgid " - Bessel 1841 in Lambert Conformal Conic"
-msgstr ""
+msgstr " - Bessel 1841 in Lambert Conformal Conic"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:156
 msgid "External tool error"
-msgstr ""
+msgstr "Fout in extern programma"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:205
 msgid "Error executing the script:"
-msgstr ""
+msgstr "Fout bij uitvoeren van het script:"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:249
@@ -39507,36 +41464,39 @@
 "stderr contents:"
 msgstr ""
+"Kind-script heeft ongeldige gegevens teruggegeven.\n"
+"\n"
+"inhoud stderr:"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtToolAction.java:24
 #, java-format
 msgid "exttool:{0}"
-msgstr ""
+msgstr "ext prog:{0}"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtToolAction.java:24
 #, java-format
 msgid "External Tool: {0}"
-msgstr ""
+msgstr "Extern programma: {0}"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
-msgstr ""
+msgstr "Bewerkingsprogramma"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:220
 msgid "Name:"
-msgstr ""
+msgstr "Naam:"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
-msgstr ""
+msgstr "OpdrRegel:"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26
 msgid "External tools"
-msgstr ""
+msgstr "Externe programma's"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73
 #, java-format
 msgid "Delete tool \"{0}\"?"
-msgstr ""
+msgstr "Verwijder programma \"{0}\"?"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
@@ -39546,21 +41506,21 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
 msgid "New tool..."
-msgstr ""
+msgstr "Nieuw programma..."
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
 msgid "Install"
-msgstr ""
+msgstr "Installeren"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
-msgstr "Alleen locatie"
+msgstr "Alleen positie"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
 msgid "Position, Time, Date, Speed"
-msgstr "Locatie, tijd, datum, snelheid"
+msgstr "Positie, tijd, datum, snelheid"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
 msgid "Position, Time, Date, Speed, Altitude"
-msgstr "Locatie, tijd, datum, snelheid, hoogte"
+msgstr "Positie, tijd, datum, snelheid, hoogte"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
@@ -39590,17 +41550,17 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
 msgid "Data Logging Format"
-msgstr "Structuur gegevensregistratie"
+msgstr "Indeling loggen van gegevens"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
 msgid "Disable data logging if speed falls below"
-msgstr "Gegevensregistratie uitschakelen als snelheid lager wordt dan"
+msgstr "Loggen van gegevens uitschakelen als snelheid lager wordt dan"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
 msgid "Disable data logging if distance falls below"
-msgstr "Gegevensregistratie uitschakelen als afstand kleiner wordt dan"
+msgstr "Loggen van gegevens uitschakelen als afstand kleiner wordt dan"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
 msgid "Unknown logFormat"
-msgstr "Onbekende logstructuur"
+msgstr "Onbekende indeling log"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
@@ -39610,5 +41570,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
 msgid "refresh the port list"
-msgstr "Poortlijst bijwerken"
+msgstr "Lijst met poorten vernieuwen"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
@@ -39630,22 +41590,22 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
 msgid "delete data after import"
-msgstr "gegevens na importeren wissen"
+msgstr "gegevens na importeren verwijderen"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:44
 msgid "Importing data from device."
-msgstr "Gegevens van apparaat importeren."
+msgstr "Gegevens vanaf apparaat importeren."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:49
 msgid "Importing data from DG100..."
-msgstr "Gegevens van DG100 importeren..."
+msgstr "Gegevens vanaf DG100 importeren..."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:63
 msgid "Error deleting data."
-msgstr "Gegevens wissen is mislukt."
+msgstr "Fout bij verwijderen van gegevens."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:69
 #, java-format
 msgid "imported data from {0}"
-msgstr "gegevens importeren van {0}"
+msgstr "gegevens importeren vanaf {0}"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:72
@@ -39655,5 +41615,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
 msgid "Connection failed."
-msgstr "Verbinding is mislukt."
+msgstr "Verbinding mislukt."
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:97
@@ -39663,12 +41623,12 @@
 "plugin/"
 msgstr ""
-"Kan bibliotheek rxtxSerial niet laden. Als je ondersteuning bij het "
-"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-mack.de/"
-"josm-globalsat-gpx-import-plugin/"
+"Kan bibliotheek rxtxSerial niet laden. Als u ondersteuning nodig hebt om het "
+"te installeren probeer danb de homepage van Globalsat op http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 msgid "Globalsat Import"
-msgstr "Globalsat-gegevens importeren"
+msgstr "Globalsat importeren"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:108
@@ -39683,5 +41643,5 @@
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18
 msgid "Add EGPX layer"
-msgstr ""
+msgstr "EGPX-laag toevoegen"
 
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:661
@@ -39707,8 +41667,25 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1277
 msgid "Select line drawing options"
-msgstr "Lijntekenopties selecteren"
+msgstr "Opties voor tekenen van lijnen selecteren"
 
 #: ../plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java:19
 msgid "GPX"
+msgstr "GPX"
+
+#: ../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 ""
 
@@ -39716,27 +41693,27 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:148
 msgid "Classes element below root child level"
-msgstr ""
+msgstr "Klassen element onder het niveau van root-kind"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:134
 #, java-format
 msgid "Class element ({0}) outside classes element"
-msgstr ""
+msgstr "Klasse-element ({0}) buiten element van klassen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:136
 msgid "Class element without name"
-msgstr ""
+msgstr "Klasse-element zonder naam"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:158
 msgid "Tag element outside basetag and implication elements"
-msgstr ""
+msgstr "Tag-element buiten basistag en impliceert elementen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:164
 msgid "Implications element below root child level"
-msgstr ""
+msgstr "Opgenomen items element onder niveau van root-kind"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:180
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:154
 msgid "Tag without key"
-msgstr ""
+msgstr "Tag zonder sleutel"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:182
@@ -39744,29 +41721,30 @@
 #, java-format
 msgid "Tag without value (key is {0})"
-msgstr ""
+msgstr "Tag zonder waarde (sleutel is {0})"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:199
 msgid "Closed classes while it was not open"
-msgstr ""
+msgstr "Gesloten klassen zonder dat ze waren geopend"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:201
 msgid "Closed classes element before all class elements were closed"
 msgstr ""
+"Gesloten klassen van element vóórdat alle klasse-elementen waren gesloten"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:209
 msgid "Closed class element while none was open"
-msgstr ""
+msgstr "Gesloten klasse-element terwijl er geen was geopend"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:217
 msgid "Closed basetags while it was not open"
-msgstr ""
+msgstr "Gesloten basistags terwijl er geen open was"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReader.java:225
 msgid "Closed implications while it was not open"
-msgstr ""
+msgstr "Gesloten opgenomen items terwijl die niet geopend waren"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:71
 msgid "Tag element inside other tag element"
-msgstr ""
+msgstr "Tag-element binnen ander tag-element"
 
 #. all vaild paths end with return; reaching this indicates an invalid tag
@@ -39774,13 +41752,13 @@
 #, java-format
 msgid "Invalid opening xml tag <{0}> in state {1}"
-msgstr ""
+msgstr "Ongeldige openings xml-tag <{0}> in status {1}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:95
 msgid "Condition isn''t finished at </condition> tag"
-msgstr ""
+msgstr "Voorwaarde is niet voldaan voor tag </condition>"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:114
 msgid "Closing tag element that was not open"
-msgstr ""
+msgstr "Sluiten van tag-element dat niet geopend was"
 
 #. all vaild paths end with return; reaching this indicates an invalid tag
@@ -39788,56 +41766,56 @@
 #, java-format
 msgid "Invalid closing xml tag </{0}> in state {1}"
-msgstr ""
+msgstr "Ongeldige sluitings xml-tag </{0}> in status {1}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:142
 #, java-format
 msgid "Some tags not been closed; now in state {0}"
-msgstr ""
+msgstr "Sommige tags zijn niet gesloten; nu in status {0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:167
 msgid "Key element without attribute k"
-msgstr ""
+msgstr "Sleutel-element zonder attribuut k"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:189
 #, java-format
 msgid "Condition is already finished at <{0}>"
-msgstr ""
+msgstr "Voorwaarde is al voldaan op <{0}>"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:207
 #, java-format
 msgid "Unknown tag for condition: {0}"
-msgstr ""
+msgstr "Onbekende tag voor voorwaarde: {0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:214
 #, java-format
 msgid "Element must not have childs: {0}"
-msgstr ""
+msgstr "Element mag geen kinderen hebben: {0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:228
 #, java-format
 msgid "Condition is already finished at </{0}>"
-msgstr ""
+msgstr "Voorwaarde is al voldaan op </{0}>"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:254
 msgid "<and> needs at least one child"
-msgstr ""
+msgstr "<and> moeten tenminste één kind hebben"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:260
 msgid "<or> needs at least one child"
-msgstr ""
+msgstr "<or> moeten tenminste één kind hebben"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:266
 msgid "<not> needs at least one child"
-msgstr ""
+msgstr "<not> moeten tenminste één kind hebben"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:273
 #, java-format
 msgid "Wrong closing tag {0} (</{1}> expected)"
-msgstr ""
+msgstr "Verkeerde sluitings-tag {0} (</{1}> verwacht)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java:286
 #, java-format
 msgid "Condition {0} not yet finished"
-msgstr ""
+msgstr "Voorwaarde {0} nog niet voltooid"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/ConnectorEvaluationGroup.java:64
@@ -39846,10 +41824,10 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/graph/JunctionEvaluationGroup.java:70
 msgid "Group not yet evaluated"
-msgstr ""
+msgstr "Groep nog niet geëvalueerd"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogic.java:92
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogic.java:159
 msgid "Collection must contain at least one condition"
-msgstr ""
+msgstr "Collectie moet ten minste één voorwaarde bevatten"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
@@ -39857,5 +41835,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:153
 msgid "No ruleset has been selected!"
-msgstr ""
+msgstr "Geen verzameling regels geselecteerd!"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:96
@@ -39863,5 +41841,5 @@
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:154
 msgid "No ruleset"
-msgstr ""
+msgstr "Geen verzameling regels"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:131
@@ -39872,4 +41850,6 @@
 "{0}"
 msgstr ""
+"Uitzondering in syntaxis voor toegang verzameling regels:\n"
+"{0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:134
@@ -39879,4 +41859,6 @@
 "{0}"
 msgstr ""
+"Bestand niet gevonden:\n"
+"{0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:137
@@ -39887,93 +41869,95 @@
 "{0}"
 msgstr ""
+"Probleem met toegang tot een bestand:\n"
+"{0}"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:167
 msgid "File not found:\n"
-msgstr ""
+msgstr "Bestand niet gevonden:\n"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java:211
 #, java-format
 msgid "Couldn''t find built-in ruleset {0}"
-msgstr ""
+msgstr "Kon ingebouwde verzameling regels {0} niet vinden"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:54
 msgid "height (m)"
-msgstr ""
+msgstr "hoogte (m)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:55
 msgid "width (m)"
-msgstr ""
+msgstr "breedte (m)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:56
 msgid "length (m)"
-msgstr ""
+msgstr "lengte (m)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:57
 msgid "speed (km/h)"
-msgstr ""
+msgstr "snelheid (km/u)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:58
 msgid "weight (t)"
-msgstr ""
+msgstr "gewicht (t)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:59
 msgid "axleload (t)"
-msgstr ""
+msgstr "asdruk (t)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:71
 msgid "Bookmark name"
-msgstr ""
+msgstr "Naam voor bladwijzer"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:85
 msgid "Bookmark name already exists!"
-msgstr ""
+msgstr "Naam voor bladwijzer bestaat al!"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:91
 #, java-format
 msgid "Bookmark name must not contain ''{0}''!"
-msgstr ""
+msgstr "Naam voor bladwijzer mag niet ''{0}'' bevatten!"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:106
 msgid "Access class"
-msgstr ""
+msgstr "Klasse voor toegang"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:121
 #, java-format
 msgid "Access class must not contain ''{0}''!"
-msgstr ""
+msgstr "Klasse voor toegang mag niet ''{0}'' bevatten!"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:139
 msgid "Access types"
-msgstr ""
+msgstr "Types voor toegang"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:176
 msgid "Vehicle properties"
-msgstr ""
+msgstr "Eigenschappen voor voertuigen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:225
 msgid "Road requirements"
-msgstr ""
+msgstr "Vereisten voor wegen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:232
 msgid "Max. incline up (%, pos.)"
-msgstr ""
+msgstr "Max. stijgingspercentage (%, pos.)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:233
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:243
 msgid "Maximum incline the vehicle can go up"
-msgstr ""
+msgstr "Maximale stijging die het voertuig omhoog kan gaan"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:250
 msgid "Max. incline down (%, pos.)"
-msgstr ""
+msgstr "Max. dalingspercentage (%, pos.)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:251
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:261
 msgid "Maximum incline the vehicle can go down"
-msgstr ""
+msgstr "Maximale daling die het voertuig omlaag kan gaan"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:268
 msgid "Surface blacklist"
-msgstr ""
+msgstr "Zwarte lijst oppervlakte"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:269
@@ -39983,8 +41967,10 @@
 "(;)"
 msgstr ""
+"Lijst van oppervlakten die het voertuig niet kan gebruiken, waarden worden "
+"gescheiden door punt-komma's (;)"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:290
 msgid "max. tracktype grade"
-msgstr ""
+msgstr "max. graad type weg"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:291
@@ -39992,134 +41978,138 @@
 msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
 msgstr ""
+"Slechtste type weg (1-5) dat het voertuig nog kan gebruiken, 0 voor geen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:345
 msgid "Change bookmark"
-msgstr ""
+msgstr "Bladwijzer wijzigen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:386
 msgid "Edit access parameters"
-msgstr ""
+msgstr "Parameters voor toegang bewerken"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:69
 msgid "Graph View Dialog"
-msgstr ""
+msgstr "Dialoogvenster Grafische weergave"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:70
 msgid "Open the dialog for graph view configuration."
 msgstr ""
+"Open het dialoogvenster voor de  configuratie van de grafische weergave."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:77
 msgid "default"
-msgstr ""
+msgstr "standaard"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:79
 msgid "end nodes"
-msgstr ""
+msgstr "eindknopen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:81
 msgid "maxspeed"
-msgstr ""
+msgstr "maxsnelheid"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:83
 msgid "maxweight"
-msgstr ""
+msgstr "maxgewicht"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:85
 msgid "maxheight"
-msgstr ""
+msgstr "maxhoogte"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:87
 msgid "incline"
-msgstr ""
+msgstr "stijging"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:107
 msgid "Ruleset:"
-msgstr ""
+msgstr "Verzameling regels:"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:121
 msgid "Parameters:"
-msgstr ""
+msgstr "Parameters:"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:135
 msgid "Coloring:"
-msgstr ""
+msgstr "Kleuren:"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewDialog.java:158
 msgid "Create/update graph"
-msgstr ""
+msgstr "Grafiek maken/bijwerken"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:77
 msgid "Graphview"
-msgstr ""
+msgstr "Grafische weergave"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:78
 msgid "Settings for the Graphview plugin that visualizes routing graphs."
 msgstr ""
+"Instellingen voor de plug-in Graphview die grafieken voor routes "
+"visualiseert."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:141
 msgid "Ruleset"
-msgstr ""
+msgstr "Verzameling regels"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:144
 msgid "Use built-in rulesets"
-msgstr ""
+msgstr "Gebruik ingebouwde verzameling regels"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:149
 msgid "External ruleset directory:"
-msgstr ""
+msgstr "Externe map voor verzameling regels"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:157
 msgid "Select directory"
-msgstr ""
+msgstr "Selecteer map"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:169
 msgid "Vehicle"
-msgstr ""
+msgstr "Voertuig"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:178
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "Create"
-msgstr ""
+msgstr "Maken"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:190
 msgid "Restore defaults"
-msgstr ""
+msgstr "Standaarden herstellen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:202
 msgid "Visualization"
-msgstr ""
+msgstr "Visualiseren"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:205
 msgid "Draw directions separately"
-msgstr ""
+msgstr "Teken richtingen afzonderlijk"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:216
 msgid "Node color"
-msgstr ""
+msgstr "Kleur knoop"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:225
 msgid "Arrow color"
-msgstr ""
+msgstr "Kleur pijl"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:234
 msgid "Arrowhead fill color"
-msgstr ""
+msgstr "Vulkleur pijlpunt"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:246
 msgid "Arrowhead placement"
-msgstr ""
+msgstr "Positie pijlpunt"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:325
 msgid "New bookmark"
-msgstr ""
+msgstr "Nieuwe bladwijzer"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:382
 #, java-format
 msgid "Really delete \"{0}\"?"
-msgstr ""
+msgstr "\"{0}\" werkelijk verwijderen?"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:383
 msgid "Bookmark deletion"
-msgstr ""
+msgstr "Bladwijzer verwijderen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:400
@@ -40128,28 +42118,30 @@
 "All manually added or edited bookmarks will be lost!"
 msgstr ""
+"Standaard bladwijzers echt herstellen?\n"
+"Alle handmatig toegevoegde of bewerkte bladwijzers zullen verloren gaan!"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:402
 msgid "Bookmark reset"
-msgstr ""
+msgstr "Herstellen van bladwijzer"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:419
 msgid "Choose node color"
-msgstr ""
+msgstr "Kleur voor knoop kiezen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:434
 msgid "Choose arrow color"
-msgstr ""
+msgstr "Kleur voor pijl kiezen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:449
 msgid "Choose arrowhead fill color"
-msgstr ""
+msgstr "Vulkleur pijlpunt kiezen"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:375
 msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgstr "Routegrafiek berekend door de plug-in GraphView"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java:380
 msgid "GraphView layer is not mergable"
-msgstr ""
+msgstr "GraphView-laag kan niet worden samengevoegd"
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:35
@@ -40158,4 +42150,6 @@
 "unit."
 msgstr ""
+"Gewicht moet worden opgegeven als een positief decimaal getal met de eenheid "
+"\"t\" of zonder eenheid."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:37
@@ -40165,4 +42159,7 @@
 "Alternatively, the format FEET'' INCHES\" can be used."
 msgstr ""
+"Lengte moet worden opgegeven als een positief decimaal getal met de eenheid "
+"\"m\", \"km\", \"mi\" of zonder eenheid.\n"
+"Als alternatief kan de indeling FEET'' INCHES\" worden gebruikt."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:40
@@ -40171,4 +42168,6 @@
 "\"mph\"."
 msgstr ""
+"Snelheid zou moeten worden opgegeven als getallen zonder eenheid of als "
+"getallen gevolgd door \"kmu\"."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:43
@@ -40176,8 +42175,12 @@
 "Inclines must be given as positive decimal numbers with followed by \"%\"."
 msgstr ""
+"Stijgingspercentages moeten worden opgegeven als positief decimaal getal "
+"gevolgd door \"%\"."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:45
 msgid "Tracktype grades must be given as integers between 0 and 5."
 msgstr ""
+"Graden voor wegtypes moeten worden opgegeven als gehele getallen tussen 0 en "
+"5."
 
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java:47
@@ -40186,32 +42189,34 @@
 "'{' '',  '' '}' '', ''='', ''|''"
 msgstr ""
+"Waarden voor oppervlakte mogen niet een van de volgende tekens bevatten: "
+"'','', '' '{' '',  '' '}' '', ''='', ''|''"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:38
 msgid "Adjust imagery"
-msgstr ""
+msgstr "Afbeelding aanpassen"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:39
 msgid "Adjust the position of the selected imagery layer"
-msgstr ""
+msgstr "Aanpassen van de positie van de geselecteerde laag met afbeeldingen"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:144
 msgid "Please select the imagery layer to adjust."
-msgstr ""
+msgstr "Selecteer de laag met afbeeldingen die moet worden aangepast."
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:149
 msgid "Select imagery layer"
-msgstr ""
+msgstr "Selecteer kaag met afbeeldingen"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150
 msgid "Start adjusting"
-msgstr ""
+msgstr "Start aanpassen"
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:169
 msgid "There are currently no imagery layer to adjust."
-msgstr ""
+msgstr "Er is momenteel geen laag met afbeeldingen om aan te passen."
 
 #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:170
 msgid "No layers to adjust"
-msgstr ""
+msgstr "Geen lagen om aan te passen"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -40258,13 +42263,13 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 msgid "WayPoint Image"
-msgstr "Waypoint-afbeelding"
+msgstr "Afbeelding wegpunt"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr "Niet-geotagged foto’s tonen"
+msgstr "Foto's zonder geo-tags weergeven"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
-msgstr "Afbeeldingen importeren"
+msgstr "Geïmporteerde afbeeldingen"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:35
@@ -40274,5 +42279,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:45
 msgid "Open images with ImageWayPoint"
-msgstr "Afbeeldingen met ImageWayPoint openen"
+msgstr "Afbeeldingen openen met ImageWayPoint"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
@@ -40282,43 +42287,43 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:24
 msgid "Import vector graphics"
-msgstr ""
+msgstr "Vectorafbeeldingen importeren"
 
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:32
 msgid "Scale:"
-msgstr ""
+msgstr "Schaal:"
 
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:35
 msgid "unit(s) = "
-msgstr ""
+msgstr "eenhe(i)d(en) = "
 
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:37
 msgid "m"
-msgstr ""
-
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:52
-#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53
+msgstr "m"
+
+#: ../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
+msgstr "Importeren..."
+
+#: ../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
+msgstr "Vectorafbeeldingen importeren."
+
+#: ../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
+msgstr "SVG-tekeningen (*.svg)"
+
+#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:133
 msgid "Importing..."
-msgstr ""
+msgstr "Aan het importeren..."
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 msgid "InfoMode"
-msgstr ""
+msgstr "InfoMode"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:62
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java:64
 msgid "GPX info mode"
-msgstr ""
+msgstr "GPX modus info"
 
 #. if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
@@ -40334,24 +42339,26 @@
 "highlight tracks"
 msgstr ""
+"Verplaats de muis om informatie over het punt op het spoor voor de huidige "
+"laag weer te geven. Houd shift ingedrukt om sporen te accentueren"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:39
 msgid "Hide this"
-msgstr ""
+msgstr "Verberg dit"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:40
 msgid "Hide this&older"
-msgstr ""
+msgstr "Verberg deze&oudere"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:103
 msgid "No timestamp"
-msgstr ""
+msgstr "Geen tijdstempel"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:105
 msgid "km/h"
-msgstr ""
+msgstr "km/u"
 
 #: ../plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java:108
 msgid "Track name: "
-msgstr ""
+msgstr "Naam spoor: "
 
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:58
@@ -40362,83 +42369,87 @@
 "with [irs rectify] in subject."
 msgstr ""
+"Deze optie maakt een IRS aanpassingslaag met een kleine weg erin. U moet "
+"eerst de plaatsing op de WMS-laag aanpassen.\n"
+"De resulterende laag moet worden opgeslagen als .osm en verzonden naar "
+"Komzpa (me@komzpa.net) met [irs rectify] in het onderwerp."
 
 #. if there are none, create one
 #: ../plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java:103
 msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "IRS Aanpassingslaag"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java:96
 msgid "Channel-Digraph created from the active OSM-Layer"
-msgstr ""
+msgstr "Channel-Digraph gemaakt vanuit de actieve OSM-laag"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:42
 msgid "Create Channel Digraph"
-msgstr ""
+msgstr "Channel Digraph maken"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68
 msgid "this layer is no osm data layer"
-msgstr ""
+msgstr "deze laag is geen gegevsnlaag van OSM"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81
 msgid "Converting OSM graph into Channel Digraph"
-msgstr ""
+msgstr "Converteren van grafiek van OSM naar Channel Digraph"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:110
 msgid "filtering ways"
-msgstr ""
+msgstr "wegen filteren"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:119
 msgid "creating Channel-Digraph"
-msgstr ""
+msgstr "Channel-Digraph maken"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:127
 msgid "sealing Digraph"
-msgstr ""
+msgstr "Digraph verzegelen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:135
 msgid "calculating Strong Connectedness"
-msgstr ""
+msgstr "berekenen van de Sterke verbondenheid"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:139
 msgid "creating DigraphLayer"
-msgstr ""
+msgstr "Digraph-laag maken"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47
 msgid "JunctionChecking"
-msgstr ""
+msgstr "Kruising controleren"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47
 msgid "Open the junctionchecking window."
-msgstr ""
+msgstr "Open het venster Kruising controleren."
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
 msgid "junctions"
-msgstr ""
+msgstr "kruisingen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:53
 msgid "Channel-Digraph creation"
-msgstr ""
+msgstr "Verkeersstroom grafiek maken"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:54
 msgid "seal Channel Digraph"
-msgstr ""
+msgstr "Verkeersstroom grafiek verzegelen"
 
 #. digraphPanel.add(digraphsealcb);
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:58
 msgid "calculate strong connected channels"
-msgstr ""
+msgstr "bereken de sterk verbonden verkeersstromen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:64
 msgid "Junctionchecking/junctions searching"
-msgstr ""
+msgstr "Kruising controleren/zoeken van kruisingen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:70
 msgid "order of junction (n):"
-msgstr ""
+msgstr "volgorde kruising(en):"
 
 #. Elemente zur OSM-Relationen-Erzeugung
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:76
 msgid "produce OSM-Relations: junction"
-msgstr ""
+msgstr "produceer OSM-relaties: kruising"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:77
@@ -40446,36 +42457,38 @@
 "if enabled the plugin produces osm-relations from the junction subgraphs"
 msgstr ""
+"indien ingeschakeld produceert de plug-in OSM-relaties vanuit de "
+"subgrafieken van de kruisingen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91
 msgid "start the channel digraph creation"
-msgstr ""
+msgstr "start het maken van de grafiek van verkeersstromen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:92
 msgid "create the channel digraph"
-msgstr ""
+msgstr "maak de grafiek van verkeersstromen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94
 msgid "Check "
-msgstr ""
+msgstr "Controleer "
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94
 msgid "check a marked subset if it is a junction"
-msgstr ""
+msgstr "controleer een gemarkeerde onderverzameling of het een kruising is"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:95
 msgid "check the subust for junction properties"
-msgstr ""
+msgstr "controleer de onderverzameling op eigenschappen van kruisingen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98
 msgid "Search "
-msgstr ""
+msgstr "Zoeken "
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98
 msgid "search for junctions into a subset of channels"
-msgstr ""
+msgstr "zoeken naar kruisingen in een onderverzameling van verkeersstromen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:99
 msgid "search for junctions in the channel subset"
-msgstr ""
+msgstr "zoeken naar kruisingen in de onderverzameling van verkeersstromen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:55
@@ -40484,35 +42497,38 @@
 "candidat mark these channel and press the \"Check\" button again."
 msgstr ""
+"De gemarkeerde verkeersstromen bevatten een kandidaat voor een kruising "
+"(wit). Markeer deze verkeersstroom en druk nogmaals op de knop \"Controleren"
+"\" om deze kandidaat te testen."
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:59
 #, java-format
 msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "De gemarkeerde verkeersstromen zijn een {0}-wegs kruising"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:69
 msgid "The marked channels are not a junction:"
-msgstr ""
+msgstr "De gemarkeerde verkeersstromen zijn geen kruising:"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java:44
 msgid "construct channel digraph and search for junctions"
-msgstr ""
+msgstr "Construeer een verkeersstromen grafiek en zoek naar kruisingen"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java:55
 #, java-format
 msgid "Number of {0}-ways junctions found: {1}"
-msgstr ""
+msgstr "Aantal gevonden {0}-wegs kruisingen: {1}"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java:83
 msgid "generate all combinations from entrie/exit candidates"
-msgstr ""
+msgstr "Genereer alle combinaties uit ingang/uitgang-kandidaten"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 #, java-format
 msgid "Direction index ''{0}'' not found"
-msgstr ""
+msgstr "Richtingsindex ''{0}'' niet gevonden"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
-msgstr "De beginlocatie bevindt zich buiten de bbox"
+msgstr "De beginlocatie bevindt zich buiten de begrenzing"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
@@ -40527,24 +42543,24 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
-msgstr "Lake Walker."
+msgstr "Lakewalker."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:19
 msgid "Lake Walker"
-msgstr "Lake Walker"
+msgstr "Lakewalker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:113
 #, java-format
 msgid "Error creating cache directory: {0}"
-msgstr "Aanmaken map voor buffergeheugen is mislukt: {0}"
+msgstr "Fout bij maken map voor cache: {0}"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:75
 msgid "Tracing"
-msgstr "Tracing"
+msgstr "Traceren"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:148
 msgid "checking cache..."
-msgstr "Buffergeheugen controleren..."
+msgstr "cache controleren..."
 
 #. *
@@ -40553,5 +42569,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
-msgstr "Knooppunten reductie uitvoeren..."
+msgstr "Reductie van knopen uitvoeren..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
@@ -40565,10 +42581,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
-msgstr "Lakewalker-trace"
+msgstr "Lakewalker-spoor"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerException.java:14
 msgid "An unknown error has occurred"
-msgstr ""
+msgstr "Er trad een onbekende fout op"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
@@ -40626,5 +42642,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
-msgstr "Nauwkeurigheid lijnvereenvoudiging (graden)"
+msgstr "Nauwkeurigheid vereenvoudiging van lijn (graden)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
@@ -40658,9 +42674,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
-msgstr "Maximale buffergrootte (MB)"
+msgstr "Maximale cachegrootte (MB)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
-msgstr "Maximale bufferleeftijd (dagen)"
+msgstr "Maximale leeftijd cache (dagen)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
@@ -40671,5 +42687,6 @@
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
-"Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
+"Maximale aantal segmenten dat is toegestaan in elke gegenereerde weg. "
+"Standaard 250"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -40678,6 +42695,6 @@
 "lines). Default 50000."
 msgstr ""
-"Maximum aantal te genereren knopen (vóór lijnvereenvoudiging). Standaard "
-"50000."
+"Maximale aantal te genereren knopen vóór het stoppen (vóór vereenvoudiging "
+"van de lijnen). Standaard 50000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
@@ -40686,6 +42703,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
-"Maximale grijswaarde die als water wordt geaccepteerd (gebaseerd op Landsat "
-"IR-1-gegevens). Tussen 0-255, standaard 90."
+"Maximale grijswaarde die als water wordt geaccepteerd (gebaseerd op gegevens "
+"Landsat IR-1). In het bereik 0-255. Standaard 90."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
@@ -40694,7 +42711,7 @@
 "<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
-"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in graden."
-"<br>Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. "
-"Standaard 0.0003."
+"Nauwkeurigheid van de vereenvoudiging van de lijn volgens Douglas-Peucker, "
+"gemeten in graden.<br>Lagere waarden resulteren in meer knopen en "
+"nauwkeurigere lijnen. Standaard 0,0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
@@ -40706,5 +42723,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
-msgstr "Grootte van een landsat-tegel, gemeten in pixels. Standaard 2000."
+msgstr "Grootte van één Landsat-tegel, gemeten in pixels. Standaard 2000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
@@ -40718,5 +42735,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
-msgstr "Richting om land te zoeken. Standaard oost."
+msgstr "Richting om naar land te zoeken. Standaard Oost."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
@@ -40727,26 +42744,26 @@
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
-"Welke WMS-laag als achtergrond gebruiken voor tracing? Standaard is IR1."
+"Welke WMS-laag als achtergrond gebruiken voor traceren? Standaard is IR1."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
-msgstr "Maximum grootte van een buffermap in bytes. Standaard is 300 MB."
+msgstr "Maximale grootte van elke cachemap in bytes. Standaard is 300 MB."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr ""
-"Maximum leeftijd voor een gebufferd bestand in dagen. Standaard is 100."
+msgstr "Maximale leeftijd voor een cachebestand in dagen. Standaard is 100."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
-msgstr "Gegevensbron tekst. Standaard is Landsat."
+msgstr "Brontekst gegevens. Standaard is Landsat."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Een plugin om waterlichamen op Landsat-beeldmateriaal te tracen."
+msgstr ""
+"Een plug-in om water-eenheden op beeldmateriaal van Landsat te traceren."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
-msgstr "Voorkeuren Lakewalker-plugin"
+msgstr "Voorkeuren plug-in Lakewalker"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
@@ -40760,46 +42777,50 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:20
 msgid "Basic License Check."
-msgstr ""
+msgstr "Basiscontrole licentie."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:21
 msgid "Checks if all contributors have agreed to the new CT/License."
 msgstr ""
+"Controleert of alle gebruikers die hebben bijgedragen hebben ingestemd met "
+"de wijziging van de CT/licentie."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:51
 msgid "Creator has rejected CT"
-msgstr ""
+msgstr "Maker heeft de CT verworpen"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:51
 msgid "Creator unknown"
-msgstr ""
+msgstr "Maker onbekend"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:56
 msgid "Creator has not (yet) accepted CT"
-msgstr ""
+msgstr "Maker heeft de CT (nog) niet geaccepteerd"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:66
 msgid "Object modified by user(s) who have rejected, or not agreed to, CT"
 msgstr ""
+"Object aangepast door gebruiker(s) die de CT hebben verworpen, of er nog "
+"niet mee hebben ingestemd"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:39
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
 msgid "License Check"
-msgstr ""
+msgstr "Controle licentie"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:39
 msgid "Performs the license check"
-msgstr ""
+msgstr "Voert de controle op de licentie uit"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:101
 msgid "Loading"
-msgstr ""
+msgstr "Laden"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:142
 msgid "Loading from Quick History Service..."
-msgstr ""
+msgstr "Laden van de Dienst Snelle geschiedenis..."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:146
 msgid "Analyzing..."
-msgstr ""
+msgstr "Analyseren..."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:76
@@ -40807,44 +42828,44 @@
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:103
 msgid "Relicensing problems"
-msgstr ""
+msgstr "Problemen met opnieuw verlenen van licentie"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:76
 msgid "Open the relicensing window."
-msgstr ""
+msgstr "Open het venster voor opnieuw verlenen van licentie."
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:40
 msgid "Relicensing Problems"
-msgstr ""
+msgstr "Problemen met opnieuw verlenen van licentie"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:101
 msgid "No relicensing problems"
-msgstr ""
+msgstr "Geen problemen met opnieuw verlenen van licentie"
 
 #. * Error messages
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:15
 msgid "Data loss"
-msgstr ""
+msgstr "Gegevensverlies"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:16
 msgid "license check error"
-msgstr ""
+msgstr "fout bij controle licentie"
 
 #. * Warning messages
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:19
 msgid "Possible data loss"
-msgstr ""
+msgstr "Mogelijk gegevensverlies"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:20
 msgid "license check warning"
-msgstr ""
+msgstr "waarschuwing bij controle licentie"
 
 #. * Other messages
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:23
 msgid "Data reduction"
-msgstr ""
+msgstr "Verminderde gegevens"
 
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
 msgid "license check notice"
-msgstr ""
+msgstr "kennisgeving bij controle licentie"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:131
@@ -40868,5 +42889,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:160
 msgid "no name"
-msgstr ""
+msgstr "geen naam"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -40877,5 +42898,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
 msgid "Show GPS data."
-msgstr "GPS-gegevens tonen."
+msgstr "GPS-gegevens weergeven."
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:50
@@ -40885,5 +42906,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
 msgid "Way Info"
-msgstr "Weginformatie"
+msgstr "Informatie over weg"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
@@ -40903,9 +42924,10 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
 msgid "Capture GPS Track"
-msgstr "GPS-track omvatten"
+msgstr "GPS-spoor vastleggen"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:48
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
+msgstr ""
+"Verbinden met gpsd-server en de huidige locatie in LiveGPS-laag weergeven."
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:61
@@ -40932,5 +42954,5 @@
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:127
 msgid "Open MapDust"
-msgstr ""
+msgstr "MapDust openen"
 
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:114
@@ -40940,5 +42962,5 @@
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:115
 msgid "Missing input data"
-msgstr ""
+msgstr "Ontbrekende gegevens invoer"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
@@ -40965,5 +42987,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
 msgid "Selection Area"
-msgstr "Oppervlak van selectie"
+msgstr "Geselecteerd gebied"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
@@ -40982,5 +43004,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:23
 msgid "measurement mode"
-msgstr "Meetmodus"
+msgstr "Modus Meten"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:39
@@ -40988,48 +43010,47 @@
 msgstr "Metingen"
 
-#: ../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
+msgstr "Overlapping samenvoegen"
+
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:55
 msgid "Merge overlap of ways."
-msgstr ""
-
-#. Commit
-#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:264
+msgstr "Overlappende wegen samenvoegen."
+
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:243
 msgid "Merge Overlap (combine)"
-msgstr ""
+msgstr "Overlapping samenvoegen (combineren)"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52
 msgid "Michigan Left"
-msgstr ""
+msgstr "Michigan links"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50
 msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Voegt Niet linksaf slaan toe voor sets van 4 of 5 wegen"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72
 msgid "Please select 4 or 5 ways to assign no left turns."
-msgstr ""
+msgstr "Selecteer 4 of 5 wegen om Niet linksaf slaan aan toe te voegen."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89
 msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "Selecteer 4 wegen die een gesloten relatie vormen."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113
 msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Niet in staat om de wegen te ordenen. Verifieer hun richtingen"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201
 msgid "Create Michigan left turn restriction"
-msgstr ""
+msgstr "Maak een beperking Niet linksaf slaan"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160
 msgid "Unable to find via nodes. Please check your selection"
-msgstr ""
+msgstr "Niet in staat om ze via knopen te vinden. Controleer uw selectie"
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
@@ -41037,139 +43058,207 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:21
 msgid "Convert to multipolygon"
-msgstr ""
+msgstr "Converteer naar multipolygoon"
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:39
 msgid "Convert to multipolygon."
-msgstr ""
+msgstr "Converteer naar multipolygoon."
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:80
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
+"Eén van de geselecteerde wegen is al een deel van een andere multipolygoon."
 
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109
 msgid "About Plugin"
-msgstr ""
-
+msgstr "Over Plug-in"
+
+#: ../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 ""
-
+msgstr "Plug-in Eigen wachtwoordbeheer"
+
+#: ../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 "
+msgstr "Er kon geen eigen beheer voor het wachtwoord worden gevonden!"
+
+#: ../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
+#, fuzzy
+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 "
+"Afhankelijk van uw besturingssysteem / distributie, moet u mogelijk eerst "
+"een standaard sleutelring / portefeuille maken."
+
+#: ../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
+#, fuzzy
+msgid "No thanks, use JOSM's plain text preferences storage"
+msgstr ""
+"Neen, dank u, gebruik de opslag voor de voorkeuren in gewone tekst van JOSM"
+
+#: ../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
+#, fuzzy
+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 ""
-
+"Gevoelige gegevens gevonden die nog steeds zijn opgeslagen in het bestand "
+"met voorkeuren van JOSM (gewone tekst)."
+
+#: ../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 ""
-
+msgstr "Nee, behoud het"
+
+#: ../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 ""
-
+msgstr "Sluit het dialoogvenster en verwerp alle wijzigingen"
+
+#: ../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 ""
-
+msgstr "Doorgaan en ga naar de volgende pagina"
+
+#: ../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 ""
-
+msgstr "Voltooien"
+
+#: ../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 ""
-
+msgstr "Bevestig de instellingen en sluit dit dialoogvenster"
+
+#: ../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 ""
-
+msgstr "JOSM/OSM API/Gebruikersnaam"
+
+#: ../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 ""
-
+msgstr "JOSM/OSM API/Wachtwoord"
+
+#: ../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 ""
-
+msgstr "JOSM/Proxy/Gebruikersnaam"
+
+#: ../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 ""
-
+msgstr "JOSM/Proxy/Wachtwoord"
+
+#: ../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 ""
-
+msgstr "JOSM/OAuth/OSM API/Sleutel"
+
+#: ../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 ""
-
+msgstr "JOSM/OAuth/OSM API/Geheime code"
+
+#: ../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 ""
-
+msgstr "Plug-in Eigen wachtwoordbeheer"
+
+#: ../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
 msgid "The username and password is protected by {0}."
-msgstr ""
-
+msgstr "De gebruikersnaam en wachtwoord zijn beveiligd door {0}."
+
+#: ../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 ""
-
+msgstr "gebruikersnaam"
+
+#: ../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 ""
-
+msgstr "wachtwoord"
+
+#: ../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 ""
-
+msgstr "proxy gebruikersnaam"
+
+#: ../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 ""
-
+msgstr "proxy wachtwoord"
+
+#: ../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 ""
-
+msgstr "oauth sleutel"
+
+#: ../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
+msgstr "oauth geheime code"
+
+#: ../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
+#, fuzzy
 msgid ""
 "<br><strong>Warning:</strong> There may be sensitive data left in your "
-"preference file. ({0})"
-msgstr ""
-
+"preference file. ("
+msgstr ""
+"<br><strong>Waarschuwing:</strong> Er kunnen gevoelige gegevens zijn "
+"achtergebleven in uw bestand met voorkeuren. ({0})"
+
+#: ../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
 msgid "Save user and password ({0})"
-msgstr ""
-
+msgstr "Gebruiker en wachtwoord opslaan ({0})"
+
+#: ../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 ""
-
+msgstr "Gewone tekst, JOSM standaard"
+
+#: ../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
@@ -41177,14 +43266,55 @@
 #, java-format
 msgid "Use {0}"
-msgstr ""
-
+msgstr "Gebruik {0}"
+
+#: ../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 ""
-
+msgstr "Versleutelde gegevens met inloggegevens voor Windows"
+
+#: ../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 ""
+"De plug-in Eigen beheer voor wachtwoord gedetecteerd {0} op uw systeem."
+
+#: ../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 ""
+"Afhankelijk van uw besturingssysteem / distributie, moet u mogelijk eerst "
+"een standaard sleutelring / portefeuille maken."
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258
+msgid "No thanks, use JOSM''s plain text preferences storage"
+msgstr ""
+"Neen, dank u, gebruik de opslag voor de voorkeuren in gewone tekst van JOSM"
+
+#: ../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 ""
+"Gevoelige gegevens gevonden die nog steeds zijn opgeslagen in het bestand "
+"met voorkeuren van JOSM (gewone tekst)."
+
+#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323
+msgid "Transfer to password manager and remove from preference file"
+msgstr ""
+"Overbrengen naar beheer voor wachtwoord en verwijderen uit het bestand met "
+"voorkeuren"
+
+#: ../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 ""
+"<br><strong>Waarschuwing:</strong> Er kunnen gevoelige gegevens zijn "
+"achtergebleven in uw bestand met voorkeuren. ({0})"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
@@ -41194,5 +43324,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
-msgstr "OpenStreetBugs-onderwerpen tonen"
+msgstr "Onderwerpen van OpenStreetBugs weergeven"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:106
@@ -41202,12 +43332,15 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>De plug-in OpenStreetBugs gebruikt de oude server op appspot.com."
+"<br>Een nieuwe server is beschikbaar op schokokeks.org.<br>Wilt u naar de "
+"nieuwe server schakelen? (Sterk aanbevolen)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Schakelen naar de nieuwe server voor OpenStreetBugs?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:205
 msgid "Unknown Host: %s - Possibly there is no connection to the Internet."
-msgstr ""
+msgstr "Onbekende host: %s - Mogelijk is er geen verbinding met het internet."
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -41217,5 +43350,5 @@
 msgstr ""
 "<html>De geselecteerde gegevens bevatten gegevens van OpenStreetBugs."
-"<br>Deze gegevens kan je niet uploaden. Heb je misschien de verkeerde laag "
+"<br>Deze gegevens mag je niet uploaden. U hebt misschien de verkeerde laag "
 "geselecteerd?"
 
@@ -41224,19 +43357,19 @@
 #, java-format
 msgid "An error occurred: {0}"
-msgstr "Een fout is opgetreden: {0}"
+msgstr "Er trad een fout op: {0}"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 #, java-format
 msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Kan geen nieuwe fout aanmaken. Resultaat: {0}"
+msgstr "Kon geen nieuwe bug maken. Resultaat: {0}"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
 msgid "Header contains several values and cannot be mapped to a single string"
 msgstr ""
-"Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst"
+"Kop bevat meerdere waarden en kan niet in één enkele string worden geplaatst"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:104
 msgid "Process queue"
-msgstr ""
+msgstr "Wachtrij om te verwerken"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
@@ -41248,8 +43381,9 @@
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
 msgstr ""
+"Opent het venster OpenStreetBugs en activeert het automatisch downloaden"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:121
 msgid "Bug list"
-msgstr ""
+msgstr "Lijst met problemen"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:144
@@ -41263,35 +43397,35 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:188
 msgid "Queue"
-msgstr ""
+msgstr "Wachtrij"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:441
 msgid "offline"
-msgstr ""
+msgstr "offline"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:441
 msgid "online"
-msgstr ""
+msgstr "online"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:441
 #, java-format
 msgid "OpenStreetBugs ({0})"
-msgstr ""
+msgstr "OpenStreetBugs ({0})"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
 msgid "Add a comment"
-msgstr "Opmerkingen toevoegen"
+msgstr "Een opmerking toevoegen"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
 msgid "Enter your comment"
-msgstr "Voer je opmerking in"
+msgstr "Voer uw opmerking in"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
 msgid "Comment: "
-msgstr ""
+msgstr "Toelichting: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
 msgid "Mark as done"
-msgstr "Als uitgevoerd markeren"
+msgstr "Als opgelost markeren"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
@@ -41304,37 +43438,39 @@
 "comment:</html>"
 msgstr ""
+"<html>Dit probleem echt als ''opgelost'' markeren?<br><br>U kunt een "
+"optionele opmerking toevoegen:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:95
 msgid "Close: "
-msgstr ""
+msgstr "Sluiten: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
 msgid "New issue"
-msgstr "Nieuw onderwerp"
+msgstr "Nieuw probleem"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
 msgid "Create issue"
-msgstr "Onderwerp aanmaken"
+msgstr "Probleem aanmaken"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
 msgid "Describe the problem precisely"
-msgstr "Geef een nauwkeurige probleemomschrijving"
+msgstr "Geef een nauwkeurige omschrijving van het probleem"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
 msgid "Create: "
-msgstr ""
+msgstr "Maken: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OpenInBrowserAction.java:49
 msgid "Open in browser"
-msgstr ""
+msgstr "Openen in browser"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OpenInBrowserAction.java:60
 msgid "No item selected"
-msgstr ""
+msgstr "Geen item geselecteerd"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OpenInBrowserAction.java:70
 msgid "Open in browser: "
-msgstr ""
+msgstr "Openen in browser: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:98
@@ -41344,39 +43480,41 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
 msgid "Unknown issue state"
-msgstr "Onderwerpstatus onbekend"
+msgstr "Onbekende status van probleem"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
 msgid "Switch to online mode"
-msgstr ""
+msgstr "Schakel naar de modus online"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
 msgid "Switch to offline mode"
-msgstr ""
+msgstr "Schakel naar de modus offline"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
 msgid "You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
+"U hebt nog niet opgeslagen wijzigingen in uw wachtrij. Wilt u die nu "
+"indienen?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:67
 msgid "OpenStreetBugs"
-msgstr ""
+msgstr "OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 msgid "Open Visible..."
-msgstr "Zichtbare openen."
+msgstr "Zichtbare openen..."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 msgid "Open only files that are visible in current view."
-msgstr "Alleen bestanden die zichtbaar zijn in het huidige beeld openen."
+msgstr "Alleen bestanden die zichtbaar zijn in de huidige weergave openen."
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
 msgid "No view open - cannot determine boundaries!"
-msgstr "Geen beeld geopend - kan de grenzen niet bepalen!"
+msgstr "Geen weergave geopend - kan de grenzen niet bepalen!"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
 #, java-format
 msgid "Unknown file extension: {0}"
-msgstr "Onbekende bestandsextentie: {0}"
+msgstr "Onbekende bestandsextensie: {0}"
 
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
@@ -41390,182 +43528,184 @@
 "the preferences."
 msgstr ""
-"Firefox is niet gevonden. Geef de locatie van Firefox op in de "
-"kaartinstellingenpagina van Voorkeuren."
+"Firefox niet gevonden. Stel het uitvoerbestand voor Firefox in op de pagina "
+"Kaartinstellingen van de voorkeuren."
 
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:149
 msgid "Firefox executable"
-msgstr "Firefox-executable"
+msgstr "uitvoerbestand Firefox"
 
 #: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142
 msgid "Transform error: Min X must be smaller than max"
-msgstr ""
+msgstr "Transformeer fout: Min X moet kleiner zijn dan max"
 
 #: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146
 msgid "Transform error: Min Y must be smaller than max"
-msgstr ""
+msgstr "Transformeer fout: Min Y moet kleiner zijn dan max"
 
 #: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152
 msgid "Transform error: Points too close"
-msgstr ""
+msgstr "Transformeer fout: Punten te dicht bij elkaar"
 
 #: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165
 #: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178
 msgid "Transform error: Unsupported variant."
-msgstr ""
+msgstr "Transformeer fout: Niet ondersteunde variant."
 
 #: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226
 msgid "Transform error: Unsupported orientation"
-msgstr ""
+msgstr "Transformeer fout: Niet ondersteunde richting"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:106
 msgid "Finished"
-msgstr ""
+msgstr "Voltooid"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238
 msgid "Select projection..."
-msgstr ""
+msgstr "Projectie selecteren..."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:243
 msgid "Prefs"
-msgstr ""
+msgstr "Voorkeuren"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:246
 msgid "Load file..."
-msgstr ""
+msgstr "Bestand laden..."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:247
 msgid "Place"
-msgstr ""
+msgstr "Plaats"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:249
 msgid "Show target"
-msgstr ""
+msgstr "Doel weergeven"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:258
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:264
 msgid "Take X and Y from selected node"
-msgstr ""
+msgstr "Neem X en Y uit de geselecteerde knoop"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:266
 msgid "Debug info"
-msgstr ""
+msgstr "Informatie over debuggen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:267
 msgid "Merge close nodes"
-msgstr ""
+msgstr "Dicht bij elkaar gelegen knopen samenvoegen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:270
 msgid "Remove objects smaller than"
-msgstr ""
+msgstr "Verwijder objecten kleiner dan"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:273
 msgid "Remove objects larger than"
-msgstr ""
+msgstr "Verwijder objecten groter dan"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:277
 msgid "Only this color"
-msgstr ""
+msgstr "Alleen deze kleur"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:280
 msgid "Remove parallel lines"
-msgstr ""
+msgstr "Verwijder parallelle lijnen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:283
 msgid "Take only first X paths"
-msgstr ""
+msgstr "Neem alleen de eerste X paden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:286
 msgid "Color/width change"
-msgstr ""
+msgstr "Wijzig kleur/breedte"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:287
 msgid "Shape closed"
-msgstr ""
+msgstr "Vorm gesloten"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:288
 msgid "Single segments"
-msgstr ""
+msgstr "Enkele segmenten"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:289
 msgid "Orthogonal shapes"
-msgstr ""
+msgstr "Loodrechte vormen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:292
 msgid "Import settings"
-msgstr ""
+msgstr "Instellingen importeren"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:337
 msgid "Introduce separate layers for:"
-msgstr ""
+msgstr "Afzonderlijke lagen introduceren voor:"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:349
 msgid "Bind to coordinates"
-msgstr ""
+msgstr "Verbinden aan coördinaten"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:354
 msgid "Projection:"
-msgstr ""
+msgstr "Projectie:"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:361
 msgid "Bottom left (min) corner:"
-msgstr ""
+msgstr "Hoek linksonder (min):"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:363
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:381
 msgid "PDF X and Y"
-msgstr ""
+msgstr "PDF X en Y"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:365
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:383
 msgid "East and North"
-msgstr ""
+msgstr "Oost en Noord"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:379
 msgid "Top right (max) corner:"
-msgstr ""
+msgstr "Hoek rechtsboven (max):"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:431
 msgid "Projection Preferences"
-msgstr ""
+msgstr "Voorkeuren projectie"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:478
 msgid "Close the dialog and apply projection preferences"
-msgstr ""
+msgstr "Sluit het dialoogvenster en pas de voorkeuren voor de projectie toe"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:491
 msgid "Close the dialog, discard projection preference changes"
 msgstr ""
+"Sluit het dialoogvenster en verwerp de wijzigingen voor de voorkeuren van de "
+"projectie"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:544
 msgid "Loading..."
-msgstr ""
+msgstr "Laden..."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:556
 msgid "PDF file preview"
-msgstr ""
+msgstr "PDF voorbeeldbestand"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:571
 msgid "Loaded"
-msgstr ""
+msgstr "Geladen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:613
 msgid "Imported PDF: "
-msgstr ""
+msgstr "Geïmporteerde PDF: "
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:704
 msgid "Please select exactly one node."
-msgstr ""
+msgstr "Selecteer exact één knoop."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:727
 msgid "PDF files"
-msgstr ""
+msgstr "PDF-bestanden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:753
 msgid "OSM files"
-msgstr ""
+msgstr "OSM-bestanden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:789
 msgid "Preparing"
-msgstr ""
+msgstr "Voorbereiden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:803
@@ -41573,264 +43713,266 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:915
 msgid "Tolerance is not a number"
-msgstr ""
+msgstr "Tolerantie is geen getal"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:817
 msgid "Could not parse color"
-msgstr ""
+msgstr "Kon de kleur niet ontleden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:830
 msgid "Could not parse max path count"
-msgstr ""
+msgstr "Kon het maximale aantal paden niet ontleden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:837
 msgid "Parsing file"
-msgstr ""
+msgstr "Bestand ontleden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:849
 msgid "File not found."
-msgstr ""
+msgstr "Bestand niet gevonden."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:856
 #, java-format
 msgid "Error while parsing: {0}"
-msgstr ""
+msgstr "Fout tijdens ontleden: {0}"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:865
 msgid "Removing parallel segments"
-msgstr ""
+msgstr "Parallelle segmenten verwijderen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:872
 msgid "Max distance is not a number"
-msgstr ""
+msgstr "Maximale afstand is geen getal"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:879
 msgid "Joining nodes"
-msgstr ""
+msgstr "Knopen verbinden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:884
 msgid "Joining adjacent segments"
-msgstr ""
+msgstr "Aanliggende segmenten verbinden"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:891
 msgid "Removing small objects"
-msgstr ""
+msgstr "Kleine objecten verwijderen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:908
 msgid "Removing large objects"
-msgstr ""
+msgstr "Grote objecten verwijderen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:921
 msgid "Finalizing layers"
-msgstr ""
+msgstr "Lagen voltooien"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:936
 msgid "Please set a projection."
-msgstr ""
+msgstr "Stel een projectie in."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:958
 msgid "Could not parse numbers. Please check."
-msgstr ""
+msgstr "Kon geen getallen ontleden. Gelieve deze te controleren."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:1017
 msgid "Building JOSM layer"
-msgstr ""
+msgstr "JOSM-laag bouwen"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:1021
 msgid "Postprocessing layer"
-msgstr ""
+msgstr "Nabewerken laag"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:1045
 msgid "Saving to file."
-msgstr ""
+msgstr "Opslaan naar bestand."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:1051
 msgid " Writing to file"
-msgstr ""
+msgstr " Schrijven naar bestand"
 
 #: ../plugins/pdfimport/src/pdfimport/OsmBuilder.java:55
 msgid "Building JOSM layer."
-msgstr ""
+msgstr "JOSM-laag bouwen."
 
 #: ../plugins/pdfimport/src/pdfimport/OsmBuilder.java:125
 msgid " "
-msgstr ""
+msgstr " "
 
 #: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:19
 #: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:22
 msgid "Import PDF file"
-msgstr ""
+msgstr "PDF-bestand importeren"
 
 #: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:20
 msgid "Import PDF file."
-msgstr ""
+msgstr "PDF-bestand importeren."
 
 #: ../plugins/pdfimport/src/pdfimport/PdfImportAction.java:37
 msgid "Import PDF"
-msgstr ""
+msgstr "PDF importeren"
 
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:21
 msgid "Import PDf file"
-msgstr ""
+msgstr "PDF-bestand importeren"
 
 #: ../plugins/pdfimport/src/pdfimport/pdfbox/GraphicsProcessor.java:52
 #, java-format
 msgid " {0} objects so far"
-msgstr ""
+msgstr " {0} objecten tot nu toe"
 
 #: ../plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java:27
 msgid "Parsing PDF"
-msgstr ""
+msgstr "PDF ontleden"
 
 #: ../plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java:32
 msgid "Encrypted documents not supported."
-msgstr ""
+msgstr "Versleutelde documenten worden niet ondersteund."
 
 #: ../plugins/pdfimport/src/pdfimport/pdfbox/PdfBoxParser.java:38
 msgid "The PDF file must have exactly one page."
-msgstr ""
+msgstr "Het PDF-bestand moet precies één pagina hebben."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
-msgstr ""
+msgstr "Leesfout!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
-msgstr ""
+msgstr "Schrijffout!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:57
 msgid "Write coordinates to image header"
-msgstr ""
+msgstr "Schrijf coördinaten naar kop van afbeelding"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:74
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
+"Schrijf informatie over positie in de kop exif van de volgende bestanden:"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:90
 msgid "settings"
-msgstr ""
+msgstr "instellingen"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:93
 msgid "keep backup files"
-msgstr ""
+msgstr "behoud back-upbestanden"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:96
 msgid "change file modification time:"
-msgstr ""
+msgstr "wijzig de wijzigingstijd van het bestand:"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:99
 msgid "to gps time"
-msgstr ""
+msgstr "naar GPS-tijd"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:99
 msgid "to previous value (unchanged mtime)"
-msgstr ""
+msgstr "naar vorige waarde (ongewijzigde mtime)"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:130
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Photo Geotagging Plugin"
-msgstr ""
+msgstr "Plug-in Photo Geotagging"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
 msgid "Writing position information to image files..."
-msgstr ""
+msgstr "Informatie over positie schrijven naar afbeeldingsbestanden..."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:208
 msgid "Could not read mtime."
-msgstr ""
+msgstr "Kon geen mtime lezen."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:221
 msgid "Could not write mtime."
-msgstr ""
+msgstr "Kon geen mtime schrijven."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:261
 msgid "File could not be deleted!"
-msgstr ""
+msgstr "Bestand kon niet wordne verwijderd!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:268
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:288
 msgid "Could not rename file!"
-msgstr ""
+msgstr "Kon bestand niet hernoemen!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:301
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
+"<html><h3>Er staan oude back-upbestanden in de map met afbeeldingen!</h3>"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:305
 msgid "Override old backup files?"
-msgstr ""
+msgstr "Oude back-upbestanden overschrijven?"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:306
 msgid "Keep old backups and continue"
-msgstr ""
+msgstr "Oude back-upbestanden behouden en doorgaan"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:306
 msgid "Override"
-msgstr ""
+msgstr "Overschrijven"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:331
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:347
 msgid "Could not delete temporary file!"
-msgstr ""
+msgstr "Kon tijdelijk bestand niet verwijderen!"
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:343
 msgid "Test failed: Could not read mtime."
-msgstr ""
+msgstr "Test mislukt: Kon geen mtime lezen."
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:345
 msgid "Test failed: Could not write mtime."
-msgstr ""
+msgstr "Test mislukt: Kon geen mtime schrijven."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
 msgid "Calibration Files"
-msgstr ""
+msgstr "Bestanden kalibreren"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:55
 msgid "Load Picture Calibration..."
-msgstr ""
+msgstr "Afbeelding kalibreren laden..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:55
 msgid "Loads calibration data from a file"
-msgstr ""
+msgstr "Laadt gegevens om te kalibreren uit ene bestand"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
 #, java-format
 msgid "Loading file failed: {0}"
-msgstr ""
+msgstr "Laden van bestand mislukt: {0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "PicLayer move"
-msgstr ""
+msgstr "Verplaatsen afbeeldingslaag"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "Drag to move the picture"
-msgstr ""
+msgstr "Sleep om de afbeelding te verplaatsen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42
 msgid "New picture layer from clipboard"
-msgstr ""
+msgstr "Nieuwe afbeeldingslaag vanaf klembord"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:75
 msgid "Supported image files"
-msgstr ""
+msgstr "Ondersteunde afbeeldingsbestanden"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:84
 msgid "New picture layer from file..."
-msgstr ""
+msgstr "Nieuwe afbeeldingslaag uit bestand..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:133
 msgid "Could not find the map object."
-msgstr ""
+msgstr "Kon het kaartobject niet vinden."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:139
 msgid "PicLayer failed to load or import the image."
-msgstr ""
+msgstr "Afbeeldingslaag kan afbeelding niet laden of importeren."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:45
 msgid "Nothing in clipboard"
-msgstr ""
+msgstr "Niets op het klembord"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:54
 msgid "The clipboard data is not an image"
-msgstr ""
+msgstr "De gegevens op het klembord is geen afbeelding"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:234
@@ -41838,4 +43980,6 @@
 msgid "A calibration file associated to the picture file was found: {0}\n"
 msgstr ""
+"Een bestand om te kalibreren, gekoppeld aan het afbeeldingsbestand, werd "
+"gevonden: {0}\n"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:242
@@ -41846,16 +43990,18 @@
 "to control the autoloading of calibration files."
 msgstr ""
+"Stel \"{0}\" in op ja/nee/vragen in de voorkeuren\n"
+"om het automatisch laden van bestanden om te kalibreren te beheren."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:244
 msgid "Do you want to apply it ?"
-msgstr ""
+msgstr "Wilt u het toepassen ?"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:245
 msgid "Load calibration file ?"
-msgstr ""
+msgstr "Bestand om te kalibreren laden ?"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:251
 msgid "It will be applied automatically."
-msgstr ""
+msgstr "Het zal automatisch worden toegepast."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:252
@@ -41863,98 +44009,101 @@
 "Also, from now on, calibration files will always be loaded automatically."
 msgstr ""
+"Ook zullen, vanaf nu, bestand om te kalibreren altijd automatisch worden "
+"geladen."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:66
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:28
 msgid "PicLayer"
-msgstr ""
+msgstr "Afbeeldingslaag"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
 msgid "Resets picture calibration"
-msgstr ""
+msgstr "Herstelt het kalibreren van afbeelding"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
 msgid "Resets picture rotation"
-msgstr ""
+msgstr "Herstelt roteren van afbeelding"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
 msgid "Reset position"
-msgstr ""
+msgstr "Positie herstellen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
 msgid "Resets picture position"
-msgstr ""
+msgstr "Herstelt positie van afbeelding"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
 msgid "Scale"
-msgstr ""
+msgstr "Schaal"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
 msgid "Resets picture scale"
-msgstr ""
+msgstr "Herstelt schaal van afbeelding"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureShearAction.java:45
 msgid "Shear"
-msgstr ""
+msgstr "Schuintrekken"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureShearAction.java:45
 msgid "Resets picture shear"
-msgstr ""
+msgstr "Herstelt  schuintrekken van afbeelding"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "PicLayer rotate"
-msgstr ""
+msgstr "Afbeeldingslaag roteren"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "Drag to rotate the picture"
-msgstr ""
+msgstr "Sleep om de afbeelding te roteren"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
 msgid "Save Picture Calibration..."
-msgstr ""
+msgstr "Kalibreren van afbeelding opslaan..."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
 msgid "Saves calibration data to a file"
 msgstr ""
+"Slaat de gegevens voor het kalibreren van een bestand op in een bestand"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
 msgid "JOSM PicLayer plugin calibration data"
-msgstr ""
+msgstr "JOSM plug-in Afbeeldingslaag gegevens om te kalibreren"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
 #, java-format
 msgid "Saving file failed: {0}"
-msgstr ""
+msgstr "Opslaan van bestand mislukt: {0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "PicLayer scale X"
-msgstr ""
+msgstr "Afbeeldingslaag schaal X"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "Drag to scale the picture in the X Axis"
-msgstr ""
+msgstr "Slepen om de afbeelding op schaal te brengen in de X-as"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "PicLayer scale"
-msgstr ""
+msgstr "Schaal afbeeldingslaag"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "Drag to scale the picture in the X and Y Axis"
-msgstr ""
+msgstr "Slepen om de afbeelding op schaal te brengen in de X- en Y-as"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "PicLayer scale Y"
-msgstr ""
+msgstr "Afbeeldingslaag schaal Y"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "Drag to scale the picture in the Y Axis"
-msgstr ""
+msgstr "Slepen om de afbeelding op schaal te brengen in de Y-as"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ShearPictureAction.java:57
 msgid "PicLayer shear"
-msgstr ""
+msgstr "Afbeeldingslaag schuintrekken"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ShearPictureAction.java:57
 msgid "Drag to shear the picture"
-msgstr ""
+msgstr "Slepen om de afbeelding schuin te trekken"
 
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:108
@@ -41962,14 +44111,14 @@
 #, java-format
 msgid "Selected: {0}"
-msgstr ""
+msgstr "Geselecteerd: {0}"
 
 #. TODO: include description in string
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:211
 msgid "Proj4J: "
-msgstr ""
+msgstr "Proj4J: "
 
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #: ../plugins/public_transport/src/public_transport/GTFSAddCommand.java:61
@@ -41977,34 +44126,34 @@
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:220
 msgid "added"
-msgstr ""
+msgstr "toegevoegd"
 
 #: ../plugins/public_transport/src/public_transport/GTFSAddCommand.java:89
 msgid "Public Transport: Enable GTFSStops"
-msgstr ""
+msgstr "Openbaar vervoer: GTFSStops inschakelen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSCatchCommand.java:112
 msgid "Public Transport: Catch GTFS stops"
-msgstr ""
+msgstr "Openbaar vervoer: GTFS-haltes vangen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSDeleteCommand.java:63
 msgid "skipped"
-msgstr ""
+msgstr "overgeslagen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSDeleteCommand.java:93
 msgid "Public Transport: Disable GTFS"
-msgstr ""
+msgstr "Openbaar vervoer: GTFS uitschakelen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:74
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:111
 msgid "Create Stops from GTFS ..."
-msgstr ""
+msgstr "Haltes maken uit GTFS ..."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
 msgid "Create Stops from a GTFS file"
-msgstr ""
+msgstr "Haltes maken uit een bestand van GTFS"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:119
 msgid "Select GTFS file (stops.txt)"
-msgstr ""
+msgstr "Selecteer bestand GTFS (stops.txt)"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:205
@@ -42012,5 +44161,5 @@
 #, java-format
 msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "IOUitzondering \"{0}\" opgetreden"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:217
@@ -42023,4 +44172,6 @@
 "file."
 msgstr ""
+"Er bestaat geen gegevensset. Probeer de gegevens te downloaden vanaf de "
+"server of open een bestand van OSM."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:219
@@ -42033,33 +44184,33 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:308
 msgid "No data found"
-msgstr ""
+msgstr "geen gegevens gevonden"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:241
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:257
 msgid "The GTFS file was empty."
-msgstr ""
+msgstr "Het bestand van GTFS file was leeg."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
 msgid "light_rail"
-msgstr ""
+msgstr "sneltram"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:81
 msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "Haltes maken uit GTFS"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:86
 msgid "GTFS-Stops"
-msgstr ""
+msgstr "GTFS-haltes"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:97
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:138
 msgid "Type of stops to add"
-msgstr ""
+msgstr "Type halte om toe te voegen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:124
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:165
 msgid "Time on your GPS device"
-msgstr ""
+msgstr "Tijd op uw GPS-apparaat"
 
 #. I18n: Don't change the time format, you only may translate the letters
@@ -42069,25 +44220,25 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:224
 msgid "HH:MM:SS.sss"
-msgstr ""
+msgstr "UU:MM:SS.sss"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:160
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:200
 msgid "Time on your stopwatch"
-msgstr ""
+msgstr "Tijd op uw stopwatch"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:196
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:235
 msgid "Time window"
-msgstr ""
+msgstr "Tijdvenster"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:220
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:259
 msgid "seconds"
-msgstr ""
+msgstr "seconden"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:231
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:270
 msgid "Move Threshold"
-msgstr ""
+msgstr "Drempel verplaatsen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:255
@@ -42096,5 +44247,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:476
 msgid "meters"
-msgstr ""
+msgstr "meters"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:266
@@ -42102,5 +44253,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:305
 msgid "Suggest Stops"
-msgstr ""
+msgstr "Haltes voorstellen"
 
 #. JButton
@@ -42111,5 +44262,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:497
 msgid "Find"
-msgstr ""
+msgstr "Zoeken"
 
 #. JButton
@@ -42120,18 +44271,18 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:523
 msgid "Mark"
-msgstr ""
+msgstr "Markeren"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:361
 msgid "Catch"
-msgstr ""
+msgstr "Vangen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:375
 msgid "Join"
-msgstr ""
+msgstr "Verbinden"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:389
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:551
 msgid "Enable"
-msgstr ""
+msgstr "Inschakelen"
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:454
@@ -42141,5 +44292,5 @@
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:112
 msgid "Can''t parse a time from this string."
-msgstr ""
+msgstr "Kan geen tijd ontleden uit deze tekenreeks."
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:454
@@ -42149,17 +44300,17 @@
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:112
 msgid "Invalid value"
-msgstr ""
+msgstr "Ongeldige waarde"
 
 #: ../plugins/public_transport/src/public_transport/GTFSJoinCommand.java:70
 msgid "moved"
-msgstr ""
+msgstr "verplaatst"
 
 #: ../plugins/public_transport/src/public_transport/GTFSJoinCommand.java:110
 msgid "Public Transport: Join GTFS stops"
-msgstr ""
+msgstr "Openbaar vervoer: GTFS-haltes verbinden"
 
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:71
 msgid "Id"
-msgstr ""
+msgstr "ID"
 
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:139
@@ -42167,17 +44318,17 @@
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:214
 msgid "pending"
-msgstr ""
+msgstr "afwachtend"
 
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:184
 msgid "outside"
-msgstr ""
+msgstr "buiten"
 
 #: ../plugins/public_transport/src/public_transport/ItineraryTableModel.java:59
 msgid "[incomplete]"
-msgstr ""
+msgstr "[incompleet]"
 
 #: ../plugins/public_transport/src/public_transport/ItineraryTableModel.java:61
 msgid "[empty way]"
-msgstr ""
+msgstr "[lege weg]"
 
 #: ../plugins/public_transport/src/public_transport/ItineraryTableModel.java:65
@@ -42185,47 +44336,47 @@
 #, java-format
 msgid "[ID] {0}"
-msgstr ""
+msgstr "[ID] {0}"
 
 #: ../plugins/public_transport/src/public_transport/ItineraryTableModel.java:120
 msgid "[gap]"
-msgstr ""
+msgstr "[gat]"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:155
 #, java-format
 msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:423
 msgid "Route patterns ..."
-msgstr ""
+msgstr "Routepatronen ..."
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
 msgid "Edit Route patterns for public transport"
-msgstr ""
+msgstr "Routepatronen voor openbaar vervoer bewerken"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:435
 msgid "Route Patterns"
-msgstr ""
+msgstr "Routepatronen"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:438
 msgid "Overview"
-msgstr ""
+msgstr "Overzicht"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:442
 msgid "Itinerary"
-msgstr ""
+msgstr "Routeschema"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:444
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
 msgid "Stops"
-msgstr ""
+msgstr "Haltes"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:446
 msgid "Meta"
-msgstr ""
+msgstr "Meta"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:460
 msgid "Existing route patterns:"
-msgstr ""
+msgstr "Bestaande routepatronen:"
 
 #. JButton
@@ -42234,90 +44385,90 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:964
 msgid "Reflect"
-msgstr ""
+msgstr "Reflecteer"
 
 #. JLabel
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:564
 msgid "Required tags:"
-msgstr ""
+msgstr "Vereiste tags:"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:631
 msgid "Common tags:"
-msgstr ""
+msgstr "Algemene tags:"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:690
 msgid "Additional tags:"
-msgstr ""
+msgstr "Aanvullende tags:"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:719
 msgid "Add a new Tag"
-msgstr ""
+msgstr "Voeg een nieuwe tag toe"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:740
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:862
 msgid "Name/Id"
-msgstr ""
+msgstr "Naam/ID"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:863
 msgid "Ref"
-msgstr ""
+msgstr "Verw"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:983
 msgid "Stops are possible on the"
-msgstr ""
+msgstr "Haltes zijn mogelijk aan de"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:994
 msgid "right hand side"
-msgstr ""
+msgstr "rechterkant"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1005
 msgid "left hand side"
-msgstr ""
+msgstr "linkerkant"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1016
 msgid "Maximum distance from route"
-msgstr ""
+msgstr "Maximale afstand vanaf route"
 
 #: ../plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java:90
 msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "Openbaar vervoer: Wijzig type van halte"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:73
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:110
 msgid "Create Stops from GPX ..."
-msgstr ""
+msgstr "Maak haltes vanuit GPX ..."
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:74
 msgid "Create Stops from a GPX file"
-msgstr ""
+msgstr "Maak haltes vanuit een GPX-bestand"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:118
 msgid "Select GPX file"
-msgstr ""
+msgstr "Selecteer GPX-bestand"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:266
 msgid "The GPX file contained no tracks or waypoints."
-msgstr ""
+msgstr "Het GPX-bestand bevat geen sporen of wegpunten."
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:82
 msgid "Create Stops from GPX"
-msgstr ""
+msgstr "Maak haltes vanuit GPX"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
 msgid "Tracks"
-msgstr ""
+msgstr "Sporen"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:104
 msgid "Tracks in this GPX file:"
-msgstr ""
+msgstr "Sporen in dit GPX-bestand:"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:400
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:537
 msgid "Detach"
-msgstr ""
+msgstr "Vastmaken"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:679
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:700
 msgid "implicit"
-msgstr ""
+msgstr "impliciet"
 
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:58
@@ -42326,72 +44477,75 @@
 "has trackpoints."
 msgstr ""
+"Het GPX-bestand bevat geen geldige punten voor een spoor. Gebruik een GPX-"
+"bestand dat punten voor een spoor bevat."
 
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:59
 msgid "GPX File Trouble"
-msgstr ""
+msgstr "Probleem met GPX-bestand"
 
 #: ../plugins/public_transport/src/public_transport/TrackReference.java:94
 msgid "unnamed"
-msgstr "Onbenoemd"
+msgstr "naamloos"
 
 #: ../plugins/public_transport/src/public_transport/TrackStoplistAddCommand.java:47
 msgid "Public Transport: Add track stop"
-msgstr ""
+msgstr "Openbaar vervoer: Voeg halte spoor toe"
 
 #: ../plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java:100
 msgid "Public Transport: Delete track stop"
-msgstr ""
+msgstr "Openbaar vervoer: Verwijder halte spoor"
 
 #: ../plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java:79
 msgid "Public Transport: Detach track stop list"
-msgstr ""
+msgstr "Openbaar vervoer: Zet de lijst met haltes voor spoor vast"
 
 #: ../plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java:101
 msgid "Public Transport: Edit track stop list"
-msgstr ""
+msgstr "Openbaar vervoer: Lijst met haltes voor spoor bewerken"
 
 #: ../plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java:92
 msgid "Public Transport: Relocate nodes in track stoplist"
 msgstr ""
+"Openbaar vervoer: Knopen in lijst met haltes voor spoor opnieuw plaatsen"
 
 #: ../plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java:97
 msgid "Public Transport: sort track stop list"
-msgstr ""
+msgstr "Openbaar vervoer: Lijst met haltes voor spoor sorteren"
 
 #: ../plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java:206
 msgid "Public Transport: Suggest stops"
-msgstr ""
+msgstr "openbaar vervoer: Voorgestelde haltes"
 
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:27
 msgid "Stopname"
-msgstr ""
+msgstr "Haltenaam"
 
 #: ../plugins/public_transport/src/public_transport/WaypointsDetachCommand.java:79
 msgid "Public Transport: Detach waypoints"
-msgstr ""
+msgstr "Openbaar vervoer: Wegpunten vastmaken"
 
 #: ../plugins/public_transport/src/public_transport/WaypointsDisableCommand.java:87
 msgid "Public Transport: Disable waypoints"
-msgstr ""
+msgstr "Openbaar vervoer: Wegpunten uitschakelen"
 
 #: ../plugins/public_transport/src/public_transport/WaypointsEnableCommand.java:84
 msgid "Public Transport: Enable waypoints"
-msgstr ""
+msgstr "Openbaar vervoer: Wegpunten inschakelen"
 
 #: ../plugins/public_transport/src/public_transport/WaypointsNameCommand.java:78
 msgid "Public Transport: Edit waypoint name"
-msgstr ""
+msgstr "Openbaar vervoer: Naam wegpunt bewerken"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:70
 msgid "Relation Toolbox"
-msgstr ""
+msgstr "Gereedschapskist Relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:70
 msgid "Open relation/multipolygon editor panel"
-msgstr ""
+msgstr "Open venster voor bewerken relatie/multipolygoon"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:404
 msgid "Specify role"
-msgstr ""
+msgstr "Specificeer rol"
 
 #. Main.main.undoRedo.add(new ChangeCommand(chosenRelation.get(), r));
@@ -42399,30 +44553,31 @@
 #, java-format
 msgid "Change relation member roles to {0}"
-msgstr ""
+msgstr "Wijzig rollen van leden relatie naar {0}"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:501
 msgid "Change multipolygon creation settings"
-msgstr ""
+msgstr "Wijzig instellingen van het maken van de multipolygoon"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:514
 msgid "Create administrative boundary relations"
-msgstr ""
+msgstr "Maak relaties voor administratieve grenzen"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:515
 msgid "Add tags boundary and admin_level to boundary relation ways"
 msgstr ""
+"Voeg tags boundary en admin_level toe aan wegen van de relatie mbt begrenzing"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:516
 msgid "Move area tags from contour to relation"
-msgstr ""
+msgstr "Verplaats tags voor gebied van contour naar relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:517
 msgid "When moving tags, consider even non-repeating ones"
-msgstr ""
+msgstr "Overweeg zelfs de niet-herhalende bij het verplaatsen van tags"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:543
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:544
 msgid "Enter role for selected members"
-msgstr ""
+msgstr "Voer rol in voor geselecteerde leden"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:544
@@ -42433,62 +44588,62 @@
 #, java-format
 msgid "Relation Toolbox: {0}"
-msgstr ""
+msgstr "Gereedschapskist Relatie: {0}"
 
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:569
 msgid "another..."
-msgstr ""
+msgstr "een andere..."
 
 #: ../plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java:34
 #: ../plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java:35
 msgid "Add/remove members from the chosen relation"
-msgstr ""
+msgstr "Leden toevoegen/verwijderen uit de gekozen relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/ClearChosenRelationAction.java:19
 msgid "Clear the chosen relation"
-msgstr ""
+msgstr "Maak de gekozen relatie leeg"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:31
 msgid "Create a multipolygon from selected objects"
-msgstr ""
+msgstr "Maak een multipolygoon van de geselecteerde objecten"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:78
 msgid "Move tags from ways to relation"
-msgstr ""
+msgstr "Verplaats tags van wegen naar relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:327
 msgid "Enter admin level and name for the border relation:"
-msgstr ""
+msgstr "Voer admin. niveau en naam in voor de relatie mbt begrenzing:"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:331
 msgid "Admin level"
-msgstr ""
+msgstr "Admin. niveau"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:39
 msgid "Create a relation from selected objects"
-msgstr ""
+msgstr "Maak een relatie van de geselecteerde objecten"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:91
 msgid "Choose a type for the relation:"
-msgstr ""
+msgstr "Kies een type voor de relatie:"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DeleteChosenRelationAction.java:17
 msgid "Delete relation"
-msgstr ""
+msgstr "Verwijder relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java:31
 msgid "Download incomplete members for the chosen relation"
-msgstr ""
+msgstr "Download incomplete leden voor de gekozen relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:33
 msgid "Download referrers for the chosen relation and its members."
-msgstr ""
+msgstr "Download verwijzingen voor de gekozen relatie en de leden er van."
 
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
 msgid "Duplicate relation"
-msgstr ""
+msgstr "Dupliceer relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java:25
 msgid "Open relation editor for the chosen relation"
-msgstr ""
+msgstr "Open de bewerker voor de relatie voor de gekozen relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java:29
@@ -42496,30 +44651,30 @@
 #: ../plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java:53
 msgid "Find a relation"
-msgstr ""
+msgstr "Zoek een relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:24
 msgid "Open relation wiki page"
-msgstr ""
+msgstr "Open de wiki-pagina voor relatie"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java:23
 msgid "Fix roles of the chosen relation members"
-msgstr ""
+msgstr "Repareer de rollen voor de leden van de gekozen relatie"
 
 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17
 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19
 msgid "Restart JOSM"
-msgstr ""
+msgstr "JOSM opnieuw starten"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
-msgstr ""
+msgstr "Draai de wijzigingenset volledig terug"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
-msgstr ""
+msgstr "Draai alleen de selectie terug"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Draai de selectie terug en herstel de verwijderde objecten"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
@@ -42527,5 +44682,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 msgid "Revert changeset"
-msgstr ""
+msgstr "Draai wijzigingenset terug"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
@@ -42536,22 +44691,22 @@
 #, java-format
 msgid "Missing merge target for {0} with id {1}"
-msgstr ""
+msgstr "Ontbrekend doel om samen te voegen voor {0} met ID {1}"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
 msgid "Objects history"
-msgstr ""
+msgstr "Geschiedenis van objecten"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
 msgid "History reverter"
-msgstr ""
+msgstr "Geschiedenis terugdraaien"
 
 #: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:54
 msgid "Preparing history data..."
-msgstr ""
+msgstr "Gegevens voor geschiedenis voorbereiden..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:50
 msgid "Reverting..."
-msgstr ""
+msgstr "Terugdraaien..."
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
@@ -42560,97 +44715,109 @@
 "It is needed to download them before reverting. Do you want to continue?"
 msgstr ""
+"Deze wijzigingenset heeft objecten die niet aanwezig zijn in de huidige set "
+"met gegevens.\n"
+"Het is nodig om ze te downloaden vóór het terugdraaien. Wilt u doorgaan?"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:60
 msgid "Confirm"
-msgstr ""
+msgstr "Bevestigen"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
 msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Ophalen ontbrekende primitieven"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
 msgid "Downloading changeset"
-msgstr ""
+msgstr "Wijzigingenset downloaden"
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
 #, java-format
 msgid "Revert changeset #{0}"
-msgstr ""
+msgstr "Draai wijzigingenset #{0} terug"
+
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201
+msgid "Found XML element <nd> not as direct child of element <way>."
+msgstr "Gevonden XML-element <nd> niet als direct kind van element <weg>."
+
+#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237
+msgid "Found XML element <member> not as direct child of element <relation>."
+msgstr ""
+"Gevonden XML-element <member> niet als direct kind van element <relatie>."
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:29
 msgid "Image files"
-msgstr ""
+msgstr "Afbeeldingsbestanden"
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
 msgid "New picture layer from RGIS..."
-msgstr ""
+msgstr "Nieuw afbeeldingslaag van RGIS..."
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
 msgid "RGIS"
-msgstr ""
+msgstr "RGIS"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 msgid "Road Sign Plugin"
-msgstr ""
+msgstr "Plug-in Road Sign"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Roadsign tagging"
-msgstr ""
+msgstr "Taggen van verkeersborden"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "Voeg tags toe door te klikken op verkeersborden"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54
 msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "Plug-in RoadSign: dialoogvenster openen"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:89
 #, java-format
 msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "Kon vooraf ingestelde bron voor taggen niet lezen: {0}"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:97
 #, java-format
 msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Fout bij ontleden van vooraf ingestelde taggen van ''{0}'':\n"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108
 #, java-format
 msgid "Sign {0}"
-msgstr ""
+msgstr "Bord {0}"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115
 #, java-format
 msgid "Additional sign {0}"
-msgstr ""
+msgstr "Aanvullend bord {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 msgid "Edit relation"
-msgstr ""
+msgstr "Relatie bewerken"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
 msgid "Edit relations"
-msgstr ""
+msgstr "Relaties bewerken"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:73
 msgid "No relation is selected"
-msgstr ""
+msgstr "Geen relatie geselecteerd"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:68
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Verwijder knoop ''{0}'' op positie {1} uit relatie ''{2}''"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:69
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Verwijder weg ''{0}'' op positie {1} uit relatie ''{2}''"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:70
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Verwijder relatie ''{0}'' op positie {1} uit relatie ''{2}''"
 
 #. TODO Use constructor with shortcut
@@ -42663,77 +44830,77 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:78
 msgid "Routing"
-msgstr ""
+msgstr "Routeren"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 msgid "Click to add destination."
-msgstr ""
+msgstr "Klik om bestemming toe te voegen."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 msgid "Click and drag to move destination"
-msgstr ""
+msgstr "Klik en sleep om bestemming te verplaatsen"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 msgid "Click to remove destination"
-msgstr ""
+msgstr "Klik om bestemming te verwijderen"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Open a list of routing nodes"
-msgstr ""
+msgstr "Open een lijst van knopen om te routeren"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:80
 msgid "Add routing layer"
-msgstr ""
+msgstr "Voeg een laag toe om te routeren"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:91
 msgid "Criteria"
-msgstr ""
+msgstr "Criteria"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:93
 msgid "Shortest"
-msgstr ""
+msgstr "Kortste"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:116
 msgid "Fastest"
-msgstr ""
+msgstr "Snelste"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:123
 msgid "Ignore oneways"
-msgstr ""
+msgstr "Eénrichting negeren"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:142
 msgid "Reverse route"
-msgstr ""
+msgstr "Route terugdraaien"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:155
 msgid "Clear route"
-msgstr ""
+msgstr "Route leegmaken"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:170
 msgid "Reconstruct Graph"
-msgstr ""
+msgstr "Grafiek opnieuw construeren"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:84
 msgid "Routing Plugin Preferences"
-msgstr ""
+msgstr "Voorkeuren plug-in Routeren"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:84
 msgid "Configure routing preferences."
-msgstr ""
+msgstr "Configureer de voorkeuren voor routeren."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:89
 msgid "Highway type"
-msgstr ""
+msgstr "Type weg"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
 msgid "Speed (Km/h)"
-msgstr ""
+msgstr "Snelheid (km/u)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:112
 msgid "Weight"
-msgstr ""
+msgstr "Gewicht"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:121
 msgid "Enter weight values"
-msgstr ""
+msgstr "Voer waarden voor gewicht in"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:194
@@ -42745,54 +44912,74 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:49
 msgid "Simplify Area"
-msgstr ""
+msgstr "Gebied vereenvoudigen"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:48
 msgid "Delete unnecessary nodes from an area."
-msgstr ""
+msgstr "Verwijder onnodige knopen uit een gebied."
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Yes, delete nodes"
+msgstr "Ja, knopen verwijderen"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Knopen verwijderen die buiten de binnengehaalde kaartgegevens vallen."
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
+msgid "No, abort"
+msgstr "Neen, afbreken"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Do you want to delete them anyway?"
+msgstr "Wilt u ze toch verwijderen?"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83
+msgid "Delete nodes outside of data regions?"
+msgstr "Knopen buiten de gebieden met gegevens verwijderen?"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:47
 msgid "Angle Threshold"
-msgstr ""
+msgstr "Drempel hoek"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:51
 msgid "Angle Factor"
-msgstr ""
+msgstr "Factor hoek"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:55
 msgid "Area Threshold"
-msgstr ""
+msgstr "Drempel gebied"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:59
 msgid "Area Factor"
-msgstr ""
+msgstr "Factor gebied"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:63
 msgid "Distance Threshold"
-msgstr ""
+msgstr "Drempel afstand"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:67
 msgid "Distance Factor"
-msgstr ""
+msgstr "Factor afstand"
 
 #. mergeThreshold.setToolTipText(tr("bla bla"));
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java:72
 msgid "Merge Nearby Nodes Threshold"
-msgstr ""
+msgstr "Drempel voor samenvoegen dicht bij elkaar gelegen knopen"
 
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:58
 msgid "Online Help"
-msgstr ""
+msgstr "Online Help"
 
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:223
 msgid "Load"
-msgstr ""
+msgstr "Laden"
 
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:274
 msgid "invisible"
-msgstr ""
+msgstr "onzichtbaar"
 
 #: ../plugins/smed/src/smed/tabs/SmedTabAction.java:35
 msgid "SeaMap Editor"
-msgstr ""
+msgstr "Bewerken SeaMap"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -42811,13 +44998,8 @@
 msgstr "Fout tijdens exporteren {0}: {1}"
 
-#: ../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 "Weg: "
-
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 #, java-format
 msgid "Duplicate hotkey for button ''{0}'' - button will be ignored!"
-msgstr ""
+msgstr "Gedupliceerde sneltoets voor knop ''{0}'' - knop zal worden genegeerd!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:40
@@ -42851,23 +45033,23 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
 msgid "Surveyor waypoint layer"
-msgstr ""
+msgstr "Surveyor laag voor wegpunten"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
 #, java-format
 msgid "{0} start"
-msgstr ""
+msgstr "{0} begin"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
 #, java-format
 msgid "{0} end"
-msgstr ""
+msgstr "{0} einde"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
 msgid "Waypoint Description"
-msgstr ""
+msgstr "Omschrijving wegpunt"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:25
 msgid "Edit tags"
-msgstr ""
+msgstr "Tags bewerken"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -42875,21 +45057,21 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:30
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Opent het dialoogvenster voor het bewerken van tags"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:149
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM plug-in Tag bewerken"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:290
 msgid "Abort tag editing and close dialog"
-msgstr ""
+msgstr "Afbreken van bewerken van tags en sluit het dialoogvenster"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:303
 msgid "Apply edited tags and close dialog"
-msgstr ""
+msgstr "Pas de bewerkte tags toe en sluit het dialoogvenster"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
 msgid "Highlight"
-msgstr ""
+msgstr "Markeren"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:169
@@ -42897,14 +45079,14 @@
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Eigenschappen van maximaal {0} object bijwerken"
+msgstr[1] "Eigenschappen van maximaal {0} objecten bijwerken"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
-msgstr ""
+msgstr "Groeperen"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
+msgstr "Item"
 
 #. should not happen
@@ -42912,5 +45094,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr ""
+msgstr "unverwachte kolomnummer {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
@@ -42918,113 +45100,116 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
-msgstr "Tester tagvoorkeuze"
+msgstr "Tester voorkeuze tags"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
-msgstr "Open tagvoorkeuzetester om de voorkeuzedialogen te bekijken."
+msgstr ""
+"Open Tester voor voorkeuze tags om de dialoogvensters voor voorkeuze te "
+"bekijken."
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven."
+msgstr ""
+"U dient eerst bronnen voor voorkeuze voor tags in Voorkeuren op te geven."
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:64
 msgid "Enter housenumbers or amount of segments"
-msgstr ""
+msgstr "Voer huisnummers of aantal segmenten in"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:97
 msgid "Terrace a house"
-msgstr ""
+msgstr "Rijtjeshuis maken"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:166
 msgid "Interpolation"
-msgstr ""
+msgstr "Interpolatie"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:172
 msgid "Lowest Number"
-msgstr ""
+msgstr "Laagste nummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:174
 msgid "Lowest housenumber of the terraced house"
-msgstr ""
+msgstr "Laagste huisnummer van het rijtjeshuis"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:176
 msgid "Highest Number"
-msgstr ""
+msgstr "Hoogste nummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:178
 msgid "List of Numbers"
-msgstr ""
+msgstr "Lijst van nummers"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:180
 msgid "add to existing associatedStreet relation"
-msgstr ""
+msgstr "voeg toe aan de bestaande relatie associatedStreet"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:180
 msgid "create an associatedStreet relation"
-msgstr ""
+msgstr "maak een relatie associatedStreet"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:183
 msgid "delete outline way"
-msgstr ""
+msgstr "verwijder contour weg"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:205
 msgid "Street name: "
-msgstr ""
+msgstr "Straatnaam: "
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:330
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:334
 msgid "Even/Odd"
-msgstr ""
+msgstr "Even/Oneven"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:130
 msgid "Lowest number"
-msgstr ""
+msgstr "Laagste nummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:134
 msgid "Highest number"
-msgstr ""
+msgstr "Hoogste nummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:178
 msgid "Lowest housenumber cannot be higher than highest housenumber"
-msgstr ""
+msgstr "Laagste huisnummer mag niet hoger zijn dan hoogste huisnummer"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:206
 msgid "Housenumbers do not match odd/even setting"
-msgstr ""
+msgstr "Huisnummers komen niet overeen met instelling voor oneven/even"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:232
 msgid "Segment must be a number greater 1"
-msgstr ""
+msgstr "Segment moet een nummer zijn groter dan 1"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:256
 #, java-format
 msgid "{0} must be greater than 0"
-msgstr ""
+msgstr "{0} moet groter zijn dan 0"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:261
 #, java-format
 msgid "{0} is not a number"
-msgstr ""
+msgstr "{0} is geen nummer"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
-msgstr "Het terras omkeren"
+msgstr "Rijtjeshuis terugdraaien"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
-msgstr "De huisnummers op een terras omkeren"
+msgstr "De huisnummers voor een rijtjeshuis terugdraaien"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
-msgstr "Een terras omkeren"
+msgstr "Een rijtjeshuis terugdraaien"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
 msgid "Cannot reverse!"
-msgstr ""
+msgstr "Kan niet terugdraaien!"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
-msgstr ""
+msgstr "Rijtjeshuis terugdraaien"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:69
@@ -43039,5 +45224,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:166
 msgid "Invalid selection"
-msgstr ""
+msgstr "Ongeldige selectie"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:168
@@ -43047,57 +45232,60 @@
 "numbering.)"
 msgstr ""
+"Selecteer één enkele, gesloten weg van tenminste vier knopen. (Optioneel "
+"kunt u ook een straat voor de tag addr:street selecteren en een knoop om het "
+"begin van de nummering te markeren.)"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
 #: ../plugins/terracer/src/terracer/TerracerAction.java:450
 msgid "Terrace"
-msgstr "Terras"
+msgstr "Rijtjeshuizen"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse"
-msgstr ""
+msgstr "Bladeren"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
 msgid "Browse map with left button"
-msgstr ""
+msgstr "Blader door de kaart met linker knop"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
-msgstr ""
+msgstr "Voeg objectknopen samen"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 msgid "Tracer"
-msgstr ""
+msgstr "Traceren"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 msgid "Tracer."
-msgstr ""
+msgstr "Traceren."
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
 msgid "Tracer building"
-msgstr ""
+msgstr "Gebouw traceren"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java:252
 msgid "GPG"
-msgstr ""
+msgstr "GPG"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:18
 msgid "Export sigs..."
-msgstr ""
+msgstr "Handtekeningen exporteren..."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:18
 msgid "Export all signatures to XML file."
-msgstr ""
+msgstr "Exporteer alle handtekeningen naar XML-bestand."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:19
 msgid "Export sigs to XML..."
-msgstr ""
+msgstr "Exporteer handtekeningen naar XML..."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java:34
 msgid "Save Signatures file"
-msgstr ""
+msgstr "Sla bestand met handtekeningen op"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:24
 msgid "Download OSM"
-msgstr ""
+msgstr "OSM downloaden"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:24
@@ -43105,8 +45293,10 @@
 "Get all referenced but not actually present OSM objects from OSM server."
 msgstr ""
+"Haal alle OSM-objecten waarnaar verwezen wordt, maar die momenteel niet "
+"aanwezig zijn, op vanaf de server van OSM."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:25
 msgid "Download referenced osm objects..."
-msgstr ""
+msgstr "Downloaden van OSM-objecten waarnaar verwezen wordt..."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:43
@@ -43114,4 +45304,6 @@
 msgid "{0} Signatures loaded. All referenced OSM objects found."
 msgstr ""
+"{0} handtekeningen geladen. Alle OSM-objecten waarnaar wordt verwezen "
+"gevonden."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:45
@@ -43121,12 +45313,14 @@
 "Do you want to load them from OSM-Server?"
 msgstr ""
+"{0} van {1} OSM-objecten wordt naar verwezen maar zijn er niet.\n"
+"Wilt u ze laden vanaf de server van OSM?"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java:45
 msgid "Load objects from server"
-msgstr ""
+msgstr "Laad objecten vanaf server"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java:38
 msgid "Download signed data"
-msgstr ""
+msgstr "Downloaden van ondertekende gegevens"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java:18
@@ -43135,58 +45329,65 @@
 "Collecting randomness..."
 msgstr ""
+"Genereren van nieuw sleutelpaar.\n"
+"Verzamelen van willekeurige..."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "KeyID"
-msgstr ""
+msgstr "SleutelID"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "OSM-Info"
-msgstr ""
+msgstr "OSM-Info"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "Signed"
-msgstr ""
+msgstr "Ondertekend"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:66
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:84
 msgid "Unknown"
-msgstr ""
+msgstr "Onbekend"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:186
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:187
 msgid "Object signatures"
-msgstr ""
+msgstr "Handtekeningen van object"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:186
 msgid "Open object signing window."
-msgstr ""
+msgstr "Open het venster om het object te ondertekenen."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:358
 msgid "Check"
-msgstr ""
+msgstr "Controleer"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:359
 msgid "Check all available signatures for selected object."
 msgstr ""
+"Controleer alle beschikbare handtekeningen voor het geselecteerde object."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:362
 msgid "Sign"
-msgstr ""
+msgstr "Ondertekenen"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:363
 msgid "Digital sign selected Tags, if you believe they are correct."
 msgstr ""
+"Digitaal ondertekenen van geselecteerde tags, als u er van overtuigd bent "
+"dat ze goed zijn."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:367
 msgid "Show all available signatures for selected attribute."
 msgstr ""
+"Geef alle beschikbare handtekeningen weer voor het geselecteerde attribuut."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:25
 msgid "Show deleted tags and notes if they were signed before"
 msgstr ""
+"Geef verwijderde tags en opmerkingen weer als zij eerder werden ondertekend"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:26
@@ -43196,4 +45397,6 @@
 "configs."
 msgstr ""
+"Gebruik standaard (en misschien bestaande) GnuPG-map ({0}) om nieuwe "
+"sleutels en configuraties op te slaan."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:27
@@ -43201,30 +45404,32 @@
 msgid "Use separate GnuPG directory ({0}) to store new keys and configs."
 msgstr ""
+"Gebruik de afzonderlijke GnuPG-map ({0}) om nieuwe sleutels en configuraties "
+"op te slaan."
 
 #. TODO Auto-generated method stub
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:32
 msgid "Trust OSM Settings"
-msgstr ""
+msgstr "Vertrouw instellingen van OSM"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:32
 msgid "Change GPG and privacy settings of the trustosm plugin."
-msgstr ""
+msgstr "Wijzig GPG en privacy-instellingen van de plug-in TrustOSM."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:41
 msgid "Use separate GnuPG configuration directory?"
-msgstr ""
+msgstr "Afzonderlijke GnuPG-configuratiemap gebruiken?"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:58
 msgid "GnuPG"
-msgstr ""
+msgstr "GnuPG"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java:62
 msgid "Dialog"
-msgstr ""
+msgstr "Dialoogvenster"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:46
 #, java-format
 msgid "Signed key value pair was: {0}={1}"
-msgstr ""
+msgstr "Ondertekend sleutel/waarde-paar was: {0}={1}"
 
 #. JTreeTable tt = new JTreeTable();
@@ -43236,13 +45441,13 @@
 #, java-format
 msgid "{0} Signatures found."
-msgstr ""
+msgstr "{0} handtekeningen gevonden."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:117
 msgid "Signature Info"
-msgstr ""
+msgstr "Informatie over handtekening"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126
 msgid "Sorry, there are no Signatures for the selected Node."
-msgstr ""
+msgstr "Sorry, er zijn geen handtekeningen voor de geselecteerde knoop."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126
@@ -43250,5 +45455,5 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:145
 msgid "No Signature found"
-msgstr ""
+msgstr "Geen handtekening gevonden"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:129
@@ -43258,8 +45463,10 @@
 "{0}"
 msgstr ""
+"Geselecteerde knoop was:\n"
+"{0}"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:136
 msgid "Sorry, there are no Signatures for the selected Attribute."
-msgstr ""
+msgstr "Sorry, er zijn geen handtekeningen voor het geselecteerde attribuut."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:138
@@ -43269,65 +45476,69 @@
 "{0}={1}"
 msgstr ""
+"Geselecteerde sleutel/waarde-paar was:\n"
+"{0}={1}"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:145
 msgid "Sorry, there are no Signatures for the selected Segment."
-msgstr ""
+msgstr "Sorry, er zijn geen handtekeningen voor het geselecteerde segment."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:147
 msgid "Selected WaySegment was:"
-msgstr ""
+msgstr "Geselecteerde wegsegment was:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigExporter.java:26
 msgid "Signature Files"
-msgstr ""
+msgstr "Bestanden handtekeningen"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigImporter.java:27
 msgid "OSM Signature Files"
-msgstr ""
+msgstr "OSM bestanden handtekeningen"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:99
 #, java-format
 msgid "Only digits allowed in osmid: ''{0}''."
-msgstr ""
+msgstr "Alleen getallen toegestaan in osmid: ''{0}''."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:137
 msgid "Could not parse OpenPGP message."
-msgstr ""
+msgstr "Kon geen OpenPGP-bericht ontleden."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:208
 msgid "Prepare stuff..."
-msgstr ""
+msgstr "Dingen voorbereiden..."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:209
 msgid "Parsing Signature data..."
-msgstr ""
+msgstr "Ontleden van gegevens handtekening..."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustAnalyzer.java:26
 msgid "The Signature is broken!"
-msgstr ""
+msgstr "De handtekening is defect!"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustAnalyzer.java:26
 msgid "Manipulation Warning"
-msgstr ""
+msgstr "Waarschuwing voor manipulatie"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:182
 msgid "Select a signing key from your keyring-file:"
 msgstr ""
+"Selecteer een sleutel voor ondertekening vanuit uw bestand voor de "
+"sleutelring:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:190
 msgid "Don''t ask again for the key"
-msgstr ""
+msgstr "Vraag niet opnieuw naar de sleutel"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:205
 msgid "Use a random key from this list"
-msgstr ""
+msgstr "Gebruik een willekeurige sleutel uit deze lijst"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:211
 msgid "Create new Key"
-msgstr ""
+msgstr "Maak een nieuwe sleutel"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:244
 msgid "Select a Key to sign"
-msgstr ""
+msgstr "Selecteer een sleutel om te ondertekenen"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:351
@@ -43338,72 +45549,75 @@
 "uploading it to the OSM-server."
 msgstr ""
+"Het object met de ID \"{0}\" ({1}) is nieuw gemaakt.\n"
+"U kunt het niet ondertekenen, omdat de handtekening de ID-verwijzing zou "
+"verliezen na het uploaden ervan naar de server van OSM."
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:351
 msgid "Signing canceled!"
-msgstr ""
+msgstr "Ondertekening geannuleerd!"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:469
 msgid "Please give a tolerance in meters"
-msgstr ""
+msgstr "Geef een tolerantie op in meters"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:478
 msgid "Accuracy"
-msgstr ""
+msgstr "Nauwkeurigheid"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:490
 msgid "Select as much as you like:"
-msgstr ""
+msgstr "Selecteer zoveel als u wilt:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:492
 msgid "Survey"
-msgstr ""
+msgstr "Landmeten"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:495
 msgid "Aerial Photography"
-msgstr ""
+msgstr "Luchtfotografie"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:498
 msgid "Web Recherche"
-msgstr ""
+msgstr "Zoeken op web"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:501
 msgid "Trusted persons told me"
-msgstr ""
+msgstr "Vertrouwde persoon vertelde mij er over"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:504
 msgid "Which source did you use?"
-msgstr ""
+msgstr "Welke bron gebruikte u?"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:657
 msgid "never"
-msgstr ""
+msgstr "nooit"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Primary user-ID: "
-msgstr ""
+msgstr "Primaire gebruikers-ID: "
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Key-ID: "
-msgstr ""
+msgstr "Sleutel-ID: "
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Fingerprint: "
-msgstr ""
+msgstr "Vingerafdruk: "
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Algorithm: "
-msgstr ""
+msgstr "Algoritme: "
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Strength in bit: "
-msgstr ""
+msgstr "Sterkte in bit: "
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Creation date: "
-msgstr ""
+msgstr "Datum maken: "
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:663
 msgid "Expiration date: "
-msgstr ""
+msgstr "Vervaldatum: "
 
 #. rows, cols
@@ -43418,25 +45632,25 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:692
 msgid "PGP-Key details"
-msgstr ""
+msgstr "Details PGP-sleutel"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "User-ID:"
-msgstr ""
+msgstr "Gebruikers-ID:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Select algorithm:"
-msgstr ""
+msgstr "Selecteer algoritme:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Choose Bitlength (Strength):"
-msgstr ""
+msgstr "Kies Bitlengte (sterkte):"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Encryption algorithm to protect private key:"
-msgstr ""
+msgstr "Algoritme voor versleuteling om private sleutel te beveiligen:"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:757
 msgid "Choose an expiry date for the key:"
-msgstr ""
+msgstr "Kies een vervaldatum voor de sleutel:"
 
 #. rows, cols
@@ -43445,9 +45659,9 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:777
 msgid "Create a new signing key"
-msgstr ""
+msgstr "Maak een nieuwe sleutel voor ondertekening"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java:149
 msgid "No such lane."
-msgstr ""
+msgstr "Rijstrook bestaat niet."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:337
@@ -43456,4 +45670,6 @@
 "missing lanes tags.</html>"
 msgstr ""
+"<html>Het aantal rijstroken is niet gespecificeerd voor één of meer wegen; "
+"voeg de ontbrekende tags voor de rijstroken toe.</html>"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java:345
@@ -43463,72 +45679,78 @@
 "validator to make sure the data is consistent.<br><br>Error: {0}</html>"
 msgstr ""
+"<html>Er trad een fout op tijdens het construeren van het model. Voer "
+"valideren uit om er voor te zorgen dat de gegevens consistent zijn."
+"<br><br>Fout: {0}</html>"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:47
 msgid "Edit turn relations and lane lengths for selected node."
 msgstr ""
+"Bewerk relaties voor afslaan en lengtes van rijstroken voor de geselecteerde "
+"knoop."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:67
 msgid "Validate turn- and lane-length-relations for consistency."
 msgstr ""
+"Valideer relaties voor afslaan en lengte van rijstroken voor consistentie."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:151
 msgid "Turn Lanes"
-msgstr ""
+msgstr "Rijstroken afslaan"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:151
 msgid "Edit turn lanes"
-msgstr ""
+msgstr "Bewerk afslaan voor rijstroken"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
 msgid "Quick-Fix"
-msgstr ""
+msgstr "Snel repareren"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34
 msgid "Revalidate all turnlanes-relations."
-msgstr ""
+msgstr "Valideer opnieuw alle relaties voor afslaan op rijstroken."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43
 msgid "Automatically fixes the issue."
-msgstr ""
+msgstr "Repareert het probleem automatisch."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58
 msgid "Selects the offending relation."
-msgstr ""
-
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:182
+msgstr "Selecteert de problematische relatie."
+
+#: ../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
+msgstr "Afslaan toevoegen"
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java:234
 msgid "Delete lane."
-msgstr ""
+msgstr "Rijstrook verwijderen."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java:193
 msgid "Delete turn."
-msgstr ""
+msgstr "Afslaan verwijderen."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:132
 #, java-format
 msgid "{0} lanes are not referenced in any turn-relation."
-msgstr ""
+msgstr "{0} rijstroken wordt niet naar verwezen in een relatie voor afslaan."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:257
 msgid "Put the ways in order."
-msgstr ""
+msgstr "Plaats de wegen in volgorde."
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:345
 #, java-format
 msgid "Relation references non-existent (regular) lane {0}"
-msgstr ""
+msgstr "Relatie verwijst naar niet bestaande (reguliere) rijstrook {0}"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:351
 #, java-format
 msgid "Relation references non-existent extra lane {0}"
-msgstr ""
+msgstr "Relatie verwijst naar niet bestaande extra rijstrook {0}"
 
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:376
 #, java-format
 msgid "Integer list \"{0}\" contains unexpected values."
-msgstr ""
+msgstr "Lijst met gehele getallen \"{0}\" bevat onverwachte waarden."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39
@@ -43539,12 +45761,14 @@
 "default value ''shift ctrl T''."
 msgstr ""
+"Waarschuwing: ongeldige waarde ''{0}'' voor sleutel voor verwijzing ''{1}''. "
+"Valt terug op de standaard waarde ''shift ctrl T''."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:62
 msgid "Create/Edit turn restriction..."
-msgstr ""
+msgstr "Maak/bewerk beperking voor afslaan..."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:64
 msgid "Create or edit a turn restriction."
-msgstr ""
+msgstr "Maak of bewerk een beperking voor afslaan."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42
@@ -43553,4 +45777,6 @@
 "relation representing this turn restriction."
 msgstr ""
+"In de volgende tabel kunt u de <strong>ruwe tags</strong> bewerken van de "
+"OSM-relatie die deze beperking voor afslaan vertegenwoordigt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -43559,30 +45785,32 @@
 "OSM relation representing this turn restriction."
 msgstr ""
+"In de volgende tabel kunt u de <strong>ruwe leden</strong> bewerken van de "
+"OSM-relatie die deze beperking voor afslaan vertegenwoordigt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:56
 msgid "Type:"
-msgstr ""
+msgstr "Type:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:66
 msgid "From:"
-msgstr ""
+msgstr "Van:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:77
 msgid "To:"
-msgstr ""
+msgstr "Naar:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:88
 msgid "Vias:"
-msgstr ""
+msgstr "Via:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:121
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:369
 msgid "Copy to the clipboard"
-msgstr ""
+msgstr "kopieer naar het klembord"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:423
 #, java-format
 msgid "Cannot find object with id ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Kan geen object vinden met ID ''{0}'' in laag ''{1}''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:426
@@ -43592,51 +45820,56 @@
 "invisible in layer ''{1}''"
 msgstr ""
-
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
+"Kan geen object ''{0}'' toevoegen als lid van de relatie omdat het is "
+"verwijderd of onzichtbaar op laag ''{1}''"
+
+#: ../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
+msgstr "Maak de geselecteerde rollen leeg of verwijder de geselecteerde leden"
+
+#: ../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
+msgstr "Voeg nieuwe leden voor de relatie in van het object op het klembord"
+
+#: ../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
+"Verplaats de geselecteerde leden van de relatie één positie naar beneden"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:191
 msgid "Move the selected relation members up by one position"
-msgstr ""
+msgstr "Verplaats de geselecteerde leden van de relatie één positie naar boven"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:135
 msgid "Edit basic attributes of a turn restriction"
-msgstr ""
+msgstr "Bewerken basis-attributen van een beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:139
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr ""
+msgstr "Bewerk de ruwe en leden van deze beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142
 msgid "Errors/Warnings"
-msgstr ""
+msgstr "Fouten/Waarschuwingen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:143
 msgid "Show errors and warnings related to this turn restriction"
 msgstr ""
+"geef fouten en waarschuwingen weer die zijn gerelateerd aan deze beperking "
+"Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:281
 #, java-format
 msgid "Create a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Maak een een nieuwe beperking Afslaan in laag ''{0}''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:283
 #, java-format
 msgid "Edit a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Bewerk een beperking Afslaan in laag ''{0}''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:285
 #, java-format
 msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Bewerk beperking Afslaan ''{0}'' in laag ''{1}''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:399
@@ -43649,29 +45882,35 @@
 "restriction. You are recommended to resolve these issues first."
 msgstr[0] ""
+"Er is nog steeds een niet opgeloste fout of waarschuwing geïdentificeerd "
+"voor deze beperking Afslaan. Het wordt aanbevolen om eerst dit probleem op "
+"te lossen."
 msgstr[1] ""
+"Er zijn nog steeds {0} fouten en/of waarschuwingen geïdentificeerd voor deze "
+"beperking Afslaan. Het wordt aanbevolen om eerst deze problemen op te lossen."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:407
 msgid "Do you want to save anyway?"
-msgstr ""
+msgstr "Wilt u toch opslaan?"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:410
 msgid "Yes, save anyway"
-msgstr ""
+msgstr "Ja, toch opslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:412
 msgid "Save the turn restriction despite of errors and/or warnings"
-msgstr ""
+msgstr "Sla de beperking Afslaan op ondanks de fouten en/of waarschuwingen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:416
 msgid "No, resolve issues first"
-msgstr ""
+msgstr "Nee, eerst de problemen oplossen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:418
 msgid "Cancel saving and start resolving pending issues first"
 msgstr ""
+"Annuleer opslaan en start eerst met het oplossen van de openstaande problemen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:426
 msgid "Pending errors and warnings"
-msgstr ""
+msgstr "Openstaande fouten en waarschuwingen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:485
@@ -43684,5 +45923,9 @@
 "this turn restriction editor:"
 msgstr[0] ""
+"Deze beperking Afslaan verwijst naar een object die werd verwijderd buiten "
+"de bewerker van deze beperking Afslaan:"
 msgstr[1] ""
+"Deze beperking Afslaan verwijst naar {0} objecten die werden verwijderd "
+"buiten de bewerker van deze beperking Afslaan:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:498
@@ -43691,26 +45934,29 @@
 "removed.<br>How to you want to proceed?"
 msgstr ""
+"Bijwerkingen aan deze beperking Afslaan kunnen niet worden opgeslagen tenzij "
+"verwijderde leden worden afgevoerd.<br>Hoe wilt u doorgaan?"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:503
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:505
 msgid "Remove deleted members and save"
-msgstr ""
+msgstr "Voer de verwijderde leden af en sla op"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:509
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:511
 msgid "Cancel and return to editor"
-msgstr ""
+msgstr "Annuleren en terugkeren naar bewerken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:519
 msgid "Deleted members in turn restriction"
-msgstr ""
+msgstr "Verwijderde leden in beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:598
 msgid "Create a conflict and close this turn restriction editor"
-msgstr ""
+msgstr "Maak een conflict en sluit de bewerker voor deze beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:604
 msgid "Return to the turn restriction editor and resume editing"
 msgstr ""
+"Keer terug naar de bewerker voor de beperking Afslaan en ga door met bewerken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:611
@@ -43720,20 +45966,24 @@
 "a conflict and close the editor?</html>"
 msgstr ""
+"<html>Deze relatie is buiten de bewerker aangepast.<br>U kunt uw "
+"aanpassingen niet toepassen en doorgaan.<br><br>Wilt u een conflict maken en "
+"de bewerker sluiten?</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634
 msgid "Already participating in a conflict"
-msgstr ""
+msgstr "Neemt al deel in een conflict"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:755
 msgid "Delete this turn restriction"
-msgstr ""
+msgstr "verwijder deze beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:785
 msgid "Select this turn restriction"
-msgstr ""
+msgstr "Selecteer deze beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:811
 msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
+"Activeer de laag waartoe deze beperking Afslaan behoort en zoom er op in"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:844
@@ -43741,6 +45991,6 @@
 msgid "{0} warning"
 msgid_plural "{0} warnings"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} waarschuwing"
+msgstr[1] "{0} waarschuwingen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:848
@@ -43748,71 +45998,73 @@
 msgid "{0} error"
 msgid_plural "{0} errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} fout"
+msgstr[1] "{0} fouten"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:861
 msgid "no issues"
-msgstr ""
+msgstr "geen problemen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:161
 msgid "please select a way"
-msgstr ""
+msgstr "selecteer een weg"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:172
 #, java-format
 msgid "multiple objects with role ''{0}''"
-msgstr ""
+msgstr "meerdere objecten met rol ''{0}''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:259
 msgid "Delete from turn restriction"
-msgstr ""
+msgstr "Verwijderen uit beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:282
 msgid "Accept the currently selected way"
-msgstr ""
+msgstr "Accepteer de huidige geselecteerde weg"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:283
 msgid "Accept"
-msgstr ""
+msgstr "Accepteren"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:399
 msgid "Paste from the clipboard"
-msgstr ""
+msgstr "Plakken vanaf het klembord"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:218
 msgid "Create new turn restriction"
-msgstr ""
+msgstr "Maak een nieuwe beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:219
 msgid "Launch the turn restriction editor to create a new turn restriction"
 msgstr ""
+"Start de bewerker voor beperkingen Afslaan om een nieuwe beperking Afslaan "
+"te maken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11
 msgid "No Right Turn"
-msgstr ""
+msgstr "Niet rechts afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:12
 msgid "No Left Turn"
-msgstr ""
+msgstr "Niet links afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:13
 msgid "No U-Turn"
-msgstr ""
+msgstr "Niet rechtsomkeert maken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14
 msgid "No Straight On"
-msgstr ""
+msgstr "Niet rechtdoor gaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15
 msgid "Only Right Turn"
-msgstr ""
+msgstr "Alleen rechts afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:16
 msgid "Only Left Turn"
-msgstr ""
+msgstr "Alleen links afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:17
 msgid "Only Straight On"
-msgstr ""
+msgstr "Alleen rechtdoor"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:34
@@ -43820,8 +46072,9 @@
 msgid "Warning: failed to load icon for turn restriction type ''{0}''"
 msgstr ""
+"Waarschuwing: laden van pictogram mislukt voor type beperking Afslaan ''{0}''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
 msgid "please select a turn restriction type"
-msgstr ""
+msgstr "selecteer een type beperking afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:61
@@ -43830,52 +46083,54 @@
 "applicable for."
 msgstr ""
+"Selecteer de voertuigtypen waarvoor deze beperking <strong>niet</strong> "
+"geldt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:84
 msgid "Public Service Vehicles"
-msgstr ""
+msgstr "Openbaar vervoer"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:85
 msgid "Public service vehicles like buses, tramways, etc."
-msgstr ""
+msgstr "Voertuigen voor openbaar vervoer zoals bussen, trams, etc."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:97
 msgid "Heavy Goods Vehicles"
-msgstr ""
+msgstr "Zwaar vrachtverkeer"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:110
 msgid "Motorcars"
-msgstr ""
+msgstr "Motorvoertuigen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:124
 msgid "Bicycles"
-msgstr ""
+msgstr "Fietsen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:195
 msgid "Use standard exceptions"
-msgstr ""
+msgstr "Standaard uitzonderingen gebruiken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:205
 msgid "Use non-standard exceptions"
-msgstr ""
+msgstr "Niet-standaard uitzonderingen gebruiken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:157
 msgid "Remove the currently selected vias"
-msgstr ""
+msgstr "De huidige geselecteerde via's verwijderen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:178
 msgid "Move the selected vias down by one position"
-msgstr ""
+msgstr "De geselecteerde via's down één positie naar beneden verplaatsen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:204
 msgid "Move the selected vias up by one position"
-msgstr ""
+msgstr "De geselecteerde via's down één positie naar boven verplaatsen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:232
 msgid "Copy the selected vias to the clipboard"
-msgstr ""
+msgstr "De geselecteerde via's naar het klembord kopiëren"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:265
 msgid "Insert ''via'' objects from the clipboard"
-msgstr ""
+msgstr "Objecten ''via'' invoegen vanaf het klembord"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
@@ -43885,28 +46140,30 @@
 "''via''."
 msgstr ""
+"Vinden van OSM-object met ID {0} uit gegevensset {1} mislukt. Kan het niet "
+"als een ''via'' toevoegen."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125
 msgctxt "turnrestrictions"
 msgid "From:"
-msgstr ""
+msgstr "Van:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:136
 msgctxt "turnrestriction"
 msgid "To:"
-msgstr ""
+msgstr "Naar:"
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:173
 msgid "no participating way with role ''from''"
-msgstr ""
+msgstr "no deelnemende weg met rol ''from''"
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:183
 msgid "no participating way with role ''to''"
-msgstr ""
+msgstr "geen deelnemende weg met rol ''to''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104
 msgid "Only participating in selection"
-msgstr ""
+msgstr "Neemt alleen deel in selectie"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:106
@@ -43916,37 +46173,41 @@
 "data set.</html>"
 msgstr ""
+"<html>Selecteren om de beperkingen Afslaan weer te geven die alleen zijn "
+"gerelateerd aan een object in de huidige selectie.<br>Deselecteren om alle "
+"beperkingen Afslaan in de huidige gegevensset weer te geven.</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:162
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:107
 msgid "Turn Restrictions"
-msgstr ""
+msgstr "Beperkingen Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164
 msgid "Display and manage turn restrictions in the current data set"
-msgstr ""
+msgstr "Beperkingen Afslaan weergeven en beheren in de huidige gegevensset"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
 msgid "Open an editor for the selected turn restriction"
-msgstr ""
+msgstr "Een bewerker voor de geselecteerde beperking Afslaan openen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
 msgid "Delete the selected turn restriction"
-msgstr ""
+msgstr "De geselecteerde beperking Afslaan verwijderen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:314
 msgid "Create a new turn restriction"
-msgstr ""
+msgstr "Een nieuwe beperking Afslaan maken"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:353
 msgid "Set the current JOSM selection to the selected turn restrictions"
 msgstr ""
+"De huidige selectie van JOSM instellen op de geselecteerde beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:355
 msgid "Select in current data layer"
-msgstr ""
+msgstr "In huidige gegevenslaag selecteren"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386
 msgid "Zoom to the currently selected turn restrictions"
-msgstr ""
+msgstr "Op de huidige geselecteerde beperkingen Afslaan inzoomen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
@@ -43955,16 +46216,18 @@
 "www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
+"De ontwikkeling van de plug-in Turn Restrictions werd gesponsord door <a "
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
 msgid "Configure the preferences for the turnrestrictions plugin"
-msgstr ""
+msgstr "De voorkeuren voor de plug-in beperking Afslaan configureren"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:97
 msgid "Sponsor"
-msgstr ""
+msgstr "Sponsor"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:106
 msgid "An OSM plugin for editing turn restrictions."
-msgstr ""
+msgstr "Een plug-in voor OSM om beperkingen bij afslaan te bewerken."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:50
@@ -43974,20 +46237,25 @@
 "disabled, editing of via-objects is possible in the Advanced Editor only."
 msgstr ""
+"De bewerker Basis kan optioneel de lijst met via-objecten van een beperking "
+"Afslaan weergeven. Indien ingeschakeld kan men ze ook bewerken in de "
+"bewerker Basis. Indien uitgeschakeld is het bewerken van de via-objecten "
+"alleen mogelijk in de bewerker Geavanceerd."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
 msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr ""
+msgstr "Lijst van via-objecten weergeven en bewerken in de bewerker Basis."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
 msgid "Road signs - Set A"
-msgstr ""
+msgstr "Verkeersborden - Set A"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:107
 msgid "Road signs - Set B"
-msgstr ""
+msgstr "Verkeersborden - Set B"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131
 msgid "Please select the set of road sign icons to be used in the plugin."
 msgstr ""
+"Selecteer de set verkeersborden die moet worden gebruikt in de plug-in."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188
@@ -43997,4 +46265,6 @@
 "Assuming the default value ''set-a''."
 msgstr ""
+"Waarschuwing: de voorkeur met toets ''{0}'' heeft een niet ondersteunde "
+"waarde ''{1}''. Verondersteld wordt de standaard waarde ''set-a''."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:49
@@ -44003,34 +46273,37 @@
 "creating/editing a turn restriction from the current JOSM selection."
 msgstr ""
+"De <strong>sneltoets voor het toetsenbord</strong>, die het maken/bewerken "
+"van een beperking Afslaan in de huidige selectie van JOSM activeert, "
+"configureren."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:65
 msgctxt "keyboard-key"
 msgid "Key:"
-msgstr ""
+msgstr "Toets:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:76
 msgctxt "keyboard-modifiers"
 msgid "Modifiers:"
-msgstr ""
+msgstr "Bijz. toetsen:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:79
 msgctxt "keyboard-modifiers"
 msgid "Shift"
-msgstr ""
+msgstr "Shift"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:81
 msgctxt "keyboard-modifiers"
 msgid "Ctrl"
-msgstr ""
+msgstr "Ctrl"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:83
 msgctxt "keyboard-modifiers"
 msgid "Alt"
-msgstr ""
+msgstr "Alt"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:86
 msgctxt "keyboard-modifiers"
 msgid "Meta"
-msgstr ""
+msgstr "Meta"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29
@@ -44042,20 +46315,24 @@
 "the way with role <tt>to</tt>, though."
 msgstr ""
+"Deze beperking Afslaan gebruikt de weg <span class=\"object-name\">{0}</"
+"span> met de rol <tt>from</tt> <strong>en</strong> met de rol <tt>to</tt>. "
+"In een beperking Afslaan zou echter de weg met de rol <tt>from</tt> "
+"verschillend moeten zijn van de weg met de rol <tt>to</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
 msgid "Delete ''from''"
-msgstr ""
+msgstr "''from'' verwijderen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
 msgid "Removes the member with role ''from''"
-msgstr ""
+msgstr "Verwijdert het lid met de rol ''from''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
 msgid "Delete ''to''"
-msgstr ""
+msgstr "''to'' verwijderen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
 msgid "Removes the member with role ''to''"
-msgstr ""
+msgstr "Verwijdert het lid met de rol ''to''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
@@ -44068,5 +46345,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80
 msgid "Fix in editor"
-msgstr ""
+msgstr "Repareren in bewerker"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58
@@ -44074,4 +46351,6 @@
 "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
 msgstr ""
+"Ga naar de bewerker Basis en kies handmatig de leden met de rollen ''from'' "
+"en ''to''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
@@ -44082,9 +46361,12 @@
 "only. Please select one in the Basic editor."
 msgstr ""
+"Deze beperking Afslaan gebruikt een niet-standaard beperkingstype <tt>{0}</"
+"tt> vpor de tagsleutel <tt>restriction</tt>. Het wordt aanbevolen om alleen "
+"standaard waarden te gebruiken. Selecteer er een in de bewerker Basis."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
 msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr ""
+msgstr "Ga naar de bewerker Basis en kies handmatig een type beperking Afslaan"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
@@ -44098,8 +46380,14 @@
 "object."
 msgstr ""
+"De <strong>from</strong>-weg <span class=\"object-name\">{0}</span> en de "
+"<strong>to</strong>-weg <span class=\"object-name\">{1}</span> kruisen bij "
+"knoop <span class=\"object-name\">{2}</span> maar <span class=\"object-name"
+"\">{2}</span> is geen <strong>via</strong>-object.<br> Aanbevolen wordt om "
+"<span class=\"object-name\">{2}</span> als uniek <strong>via</strong>-object "
+"in te stellen."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
 msgid "Set via-Object"
-msgstr ""
+msgstr "Via-object instellen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
@@ -44108,8 +46396,10 @@
 "intersection"
 msgstr ""
+"Vervangt de huidige geconfigureerde via-objecten van de knoop op de kruising"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
 msgstr ""
+"Ga naar de bewerker Basis en repareer handmatig de lijst met via-objecten"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
@@ -44118,28 +46408,30 @@
 "type in the Basic Editor."
 msgstr ""
+"Een beperking Afslaan moet het type beperking declareren. Selecteer een type "
+"in de bewerker Basis."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
 msgid "A way with role <tt>from</tt> is required in a turn restriction."
-msgstr ""
+msgstr "Een weg met de rol <tt>from</tt> is vereist in een beperking Afslaan."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
 msgid "A way with role <tt>to</tt> is required in a turn restriction."
-msgstr ""
+msgstr "Een weg met de rol <tt>to</tt> is vereist in een beperking Afslaan."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
 msgid "Please go to the Basic editor and manually choose a way."
-msgstr ""
+msgstr "Ga naar de bewerker Basis en kies handmatig een weg"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
 msgid "Add in editor"
-msgstr ""
+msgstr "In bewerker toevoegen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
 msgid "Add a way with role ''from''"
-msgstr ""
+msgstr "Een weg met de rol ''from'' toevoegen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
 msgid "Add a way with role ''to''"
-msgstr ""
+msgstr "Een weg met de rol ''to'' toevoegen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:24
@@ -44148,4 +46440,6 @@
 "</strong>"
 msgstr ""
+"De twee deelnemende wegen in de beperking Afslaan <strong>zijn niet "
+"verbonden.</strong>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:26
@@ -44154,8 +46448,10 @@
 "restriction."
 msgstr ""
+"Zorg er voor dat u één of meer objecten via-objecten (knopen of wegen) aan "
+"de beperking Afslaan toevoegt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingViaError.java:33
 msgid "Go to the Advanced Editor and add via objects"
-msgstr ""
+msgstr "Ga naar de bewerker Geavanceerd en voeg via-objecten toe"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
@@ -44165,4 +46461,6 @@
 "turn restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"Een beperking Afslaan vereist exact één weg met de rol <tt>from</tt>. De "
+"beperking Afslaan heeft {0} wegen met die rol. Verwijder er {1} van."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
@@ -44172,8 +46470,10 @@
 "restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"Een beperking Afslaan vereist exact één weg met de rol <tt>to</tt>. De "
+"beperking Afslaan heeft {0} wegen met die rol. Verwijder er {1} van."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
 msgid "Go to the Advanced Editor and remove the members"
-msgstr ""
+msgstr "Ga naar de bewerker Geavanceerd en verwijder de leden"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
@@ -44183,22 +46483,27 @@
 "recommended to use standard values for <tt>except</tt> only."
 msgstr ""
+"De tag <tt>except</tt> heeft de niet-standaard waarde <tt>{0}</tt>. "
+"Aanbevolen wordt om voor <tt>except</tt> alleen standaard waarden te "
+"gebruiken."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
 msgstr ""
+"Ga naar de bewerker Basis en selecteer uitzonderingen die zijn gebaseerd op "
+"standaard voertuigtypen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
 #, java-format
 msgid "The required tag <tt>{0}={1}</tt> is missing."
-msgstr ""
+msgstr "De vereiste tag <tt>{0}={1}</tt> ontbreekt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
 msgid "Add missing tag"
-msgstr ""
+msgstr "Ontbrekende tag toevoegen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
 #, java-format
 msgid "Add the missing tag {0}={1}"
-msgstr ""
+msgstr "De ontbrekende tag {0}={1} toevoegen"
 
 #.
@@ -44213,4 +46518,8 @@
 "should be split at the intersecting node."
 msgstr ""
+"De weg <span class=\"object-name\">{0}</span> met de rol <tt>from</tt> en de "
+"weg <span class=\"object-name\">{1}</span> met de rol <tt>to</tt> kruisen "
+"bij knoop <span class=\"object-name\">{2}</span>. <p> Beide wegen zouden "
+"moeten worden gesplitst op de kruisende knoop."
 
 #.
@@ -44228,12 +46537,15 @@
 "way <span class=\"object-name\">{3}</span>."
 msgstr ""
+"De weg <span class=\"object-name\">{0}</span> met de rol <tt>{1}</tt> zou "
+"moeten worden gesplitst bij knoop <span class=\"object-name\">{2}</span> "
+"waar wordt verbonden met weg <span class=\"object-name\">{3}</span>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:127
 msgid "Split now"
-msgstr ""
+msgstr "Nu splitsen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:128
 msgid "Split the ways"
-msgstr ""
+msgstr "De wegen splitsen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
@@ -44243,4 +46555,6 @@
 "as member with role <tt>{1}</tt>."
 msgstr ""
+"Deze beperking Afslaan gebruikt de knoop <span class=\"object-name\">{0}</"
+"span> als lid met de rol <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
@@ -44250,63 +46564,67 @@
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
+"Deze beperking Afslaan gebruikt de relatie <span class=\"object-name\">{0}</"
+"span> als lid met de rol <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
 msgid "A way is required instead."
-msgstr ""
+msgstr "In plaats daarvan wordt een weg vereist."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
 msgid "Delete the member from the turn restriction"
-msgstr ""
+msgstr "Het lid uit de beperking Afslaan verwijderen"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
 msgid "Change to the Basic Editor and select a way"
-msgstr ""
+msgstr "Schakel over naar de bewerker Basis en selecteer een weg"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:68
 msgid "Undelete object..."
-msgstr ""
+msgstr "Object terughalen..."
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:68
 msgid "Undelete object by id"
-msgstr ""
+msgstr "Object terughalen op ID"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:74
 msgid "Select if the data should be added into a new layer"
 msgstr ""
+"Selecteren als de gegevens zouden moeten worden toegevoegd aan een nieuwe "
+"laag"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
 msgid "Enter the ID of the object that should be undeleted"
-msgstr ""
+msgstr "Voer de ID in van het object dat zou moeten worden teruggehaald"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:105
 msgid "Undelete Object"
-msgstr ""
+msgstr "Object terughalen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
 msgid "Undelete object"
-msgstr ""
+msgstr "Object terughalen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:111
 msgid "Start undeleting"
-msgstr ""
+msgstr "Beginnen met terughalen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:112
 msgid "Close dialog and cancel"
-msgstr ""
+msgstr "Dialoogvenster sluiten en annuleren"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168
 #, java-format
 msgid "Will get {0}"
-msgstr ""
+msgstr "Zal krijgen {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:172
 #, java-format
 msgid "Looking for {0}"
-msgstr ""
+msgstr "Zoeken naar {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
 #, java-format
 msgid "Found {0}"
-msgstr ""
+msgstr "Gevonden {0}"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:30
@@ -44314,22 +46632,38 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:53
 msgid "Add nodes at intersections"
-msgstr ""
+msgstr "Knopen bij kruisingen toevoegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:30
 msgid "Add missing nodes at intersections of selected ways."
-msgstr ""
+msgstr "Ontbrekende knopen bij kruisingen of geselecteerde wegen toevoegen."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:43
 msgid "Please select one or more ways with intersections of segments."
-msgstr ""
+msgstr "Selecteer één of meer wegen met kruisingen of segmenten."
+
+#: ../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 "Aangepaste URL configureren"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:33
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:46
 msgid "Extract node"
-msgstr ""
+msgstr "Knoop weghalen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:34
 msgid "Extracts node from a way"
-msgstr ""
+msgstr "Haalt een knoop weg uit een weg"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:45
@@ -44338,48 +46672,35 @@
 "selected."
 msgstr ""
+"Dit programma haalt een knoop weg uit zijn wegen en vereist dat één enkele "
+"knoop wordt geselecteerd."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:67
 msgid "Extract node from line"
-msgstr ""
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46
-#, fuzzy
+msgstr "Knoop uit lijn weghalen"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:37
+#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:39
 msgid "Open custom URL"
-msgstr "Een URL openen."
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:45
+msgstr "Aangepaste URL openen"
+
+#: ../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 "Instellen sites..."
+msgstr "Voor URL gespecificeerde browser openen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
-msgstr ""
+msgstr "Object splitsen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split an object at the selected nodes."
-msgstr ""
+msgstr "Splitst een object op de geselecteerde knopen."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:64
 msgid "The current selection cannot be used for splitting."
-msgstr "De huidige selectie kan niet gebruik worden voor splitsen."
+msgstr "De huidige selectie kan niet gebruikt worden voor splitsen."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:140
 msgid "The selected way is not closed."
-msgstr ""
+msgstr "De geselecteerde weg is niet gesloten."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:149
@@ -44392,4 +46713,5 @@
 msgid "The selected nodes can not be consecutive nodes in the object."
 msgstr ""
+"De geselecteerde knopen mogen geen opvolgende knopen in het object zijn."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:36
@@ -44397,5 +46719,5 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:85
 msgid "Symmetry"
-msgstr ""
+msgstr "Symmetrie"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:63
@@ -44404,8 +46726,10 @@
 "mirror."
 msgstr ""
+"Selecteer ten minste twee knopen als symmetrie-as en iets anders om te "
+"spiegelen."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
 msgid "UnGlue Relation"
-msgstr ""
+msgstr "Relatie losmaken"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:44
@@ -44413,37 +46737,69 @@
 "Duplicate nodes, ways and relations that are used by multiple relations."
 msgstr ""
+"Knopen, wegen en relaties dupliceren die worden gebruikt door meerdere "
+"relaties."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:45
 msgid "UnGlue Relations"
-msgstr ""
+msgstr "Relaties losmaken"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:85
 msgid "Unglued Relations"
-msgstr ""
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:46
+msgstr "Losgemaakte relaties"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:51
 msgid "More tools"
+msgstr "Meer programma's"
+
+#: ../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"
-msgstr ""
+msgstr "Uitlijnen wegknopen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:24
 msgid "Align nodes in a way"
-msgstr ""
+msgstr "Lijnt knopen op een weg uit"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:37
 msgid "The way with selected nodes can not be straightened."
-msgstr ""
+msgstr "De weg met geselecteerde knopen kan niet worden recht getrokken."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:67
 #, java-format
 msgid "Internal error: number of nodes is {0}."
-msgstr ""
+msgstr "Interne fout: aantal knopen is {0}."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:19
 msgid "Paste Relations"
-msgstr ""
+msgstr "Relaties plakken"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:22
@@ -44451,12 +46807,14 @@
 "Paste relation membership from objects in the buffer onto selected object(s)"
 msgstr ""
+"Plak het lidmaatschap van de relaties van objecten in de buffer op "
+"geselecteerde object(en)"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:25
 msgid "Replace Geometry"
-msgstr ""
+msgstr "Geometrie vervangen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:29
 msgid "Replace geometry of selected way with a new one"
-msgstr ""
+msgstr "Geometrie van geselecteerde weg door een nieuwe vervangen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:40
@@ -44465,4 +46823,6 @@
 "to be selected."
 msgstr ""
+"Dit programma vervangt de geometrie van één weg door een andere, en vereist "
+"dat twee wegen zijn geselecteerd."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:49
@@ -44471,17 +46831,19 @@
 "correct geometry."
 msgstr ""
+"Selecteer één weg die bestaat in de database en één nieuwe weg met de juiste "
+"geometrie."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:118
 #, java-format
 msgid "Replace geometry for way {0}"
-msgstr ""
+msgstr "Vervang geometrie voor weg {0}"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:24
 msgid "Split adjacent ways"
-msgstr ""
+msgstr "Aansluitende wegen splitsen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:27
 msgid "Split adjacent ways on T-intersections"
-msgstr ""
+msgstr "Aansluitende wegen op T-kruisingen splitsen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:68
@@ -44490,86 +46852,104 @@
 "participating in this operation."
 msgstr ""
+"Er zijn verschillende wegen die één van de gesplitste knopen bevatten. "
+"Selecteer wegen die deelnemen in deze bewerking."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:19
 msgid "Copy tags from previous selection"
-msgstr ""
+msgstr "Kopieer tags uit eerdere selectie"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:25
 msgid "Pastes tags of previously selected object(s)"
-msgstr ""
+msgstr "Plak tags van eerder geselecteerde object(en)"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:19
 msgid "Add Source Tag"
-msgstr ""
+msgstr "Brontag toevoegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:25
 msgid "Add remembered source tag"
-msgstr ""
+msgstr "Onthouden brontag toevoegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java:25
 msgid "Adjacent nodes"
-msgstr ""
+msgstr "Aansluitende knopen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java:25
 msgid "Select adjacent nodes"
-msgstr ""
+msgstr "Selecteer aansluitende knopen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:25
 msgid "Adjacent ways"
-msgstr ""
+msgstr "Aansluitende wegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java:26
 msgid "Adjacent ways will be selected. Nodes will be deselected."
 msgstr ""
+"Aansluitende wegen zullen worden geselecteerd. Selectie van knopen zal "
+"worden opgeheven."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java:23
 msgid "All connected ways"
-msgstr ""
+msgstr "Alle verbonden wegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java:23
 msgid "Select all connected ways"
-msgstr ""
+msgstr "Selecteer alle verbonden wegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:25
 msgid "Intersecting ways"
-msgstr ""
+msgstr "Kruisende wegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:25
 msgid "Select intersecting ways"
-msgstr ""
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:48
+msgstr "Selecteer kruisende wegen"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:44
 msgid "Please select some ways to find connected and intersecting ways!"
-msgstr ""
+msgstr "Selecteer enkele wegen om verbonden en kruisende wegen te vinden!"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:25
 msgid "All intersecting ways"
-msgstr ""
+msgstr "Alle kruisende wegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:25
 msgid "Select all intersecting ways"
-msgstr ""
-
-#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:48
+msgstr "Selecteer alle kruisende wegen"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:46
 msgid "Please select some ways to find all connected and intersecting ways!"
-msgstr ""
+msgstr "Selecteer enkele wegen om alle verbonden en kruisende wegen te vinden!"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:27
 msgid "Middle nodes"
-msgstr ""
+msgstr "Middelste knopen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:27
 msgid "Select middle nodes"
-msgstr ""
+msgstr "Selecteer de middelste knopen"
 
 #: ../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
+msgstr "Selecteer twee knopen die zijn verbonden door een weg!"
+
+#: ../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 "Er zijn teveel wegen toegevoegd: {0}!"
+
+#: ../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 ""
 
@@ -44577,69 +46957,70 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:28
 msgid "Select last modified nodes"
-msgstr ""
+msgstr "Selecteer de laatste aangepaste knpen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:27
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:28
 msgid "Select last modified ways"
-msgstr ""
+msgstr "Selecteer de laatste aangepaste wegen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:32
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:33
 msgid "Select Way Nodes"
-msgstr ""
+msgstr "Selecteer wegknopen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:32
 msgid "Select all nodes of a selected way."
-msgstr ""
+msgstr "Selecteer alle kopen van een geselecteerde weg."
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:26
 msgid "Undo selection"
-msgstr ""
+msgstr "Selectie ongedaan maken"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:27
 msgid "Reselect last added object or selection form history"
 msgstr ""
+"Selecteer het laatst toegevoegde object opnieuw of selectie uit geschiedenis"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java:23
 msgid "Unselect nodes"
-msgstr ""
+msgstr "Selectie van knopen opheffen"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java:24
 msgid "Removes all nodes from selection"
-msgstr ""
+msgstr "Alle knopen uit selectie verwijderen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:88
 msgid "Import Video"
-msgstr ""
+msgstr "Video importeren"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:88
 msgid "Sync a video against this GPS track"
-msgstr ""
+msgstr "Synchroniseer een video tegen dit GPS-spoor"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:94
 msgid "Remove Video"
-msgstr ""
+msgstr "Video verwijderen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:94
 msgid "removes current video from layer"
-msgstr ""
+msgstr "huidige video uit laag verwijderen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:100
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:101
 msgid "Play/Pause"
-msgstr "Afspelen/Pauzeren"
+msgstr "Afspelen/Pauze"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:100
 msgid "starts/pauses video playback"
-msgstr ""
+msgstr "start/pauzeert het afspelen van de video"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:106
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:107
 msgid "Backward"
-msgstr ""
+msgstr "Terug"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:106
 msgid "jumps n sec back"
-msgstr ""
+msgstr "springt n sec terug"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:112
@@ -44650,5 +47031,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:112
 msgid "jumps n sec forward"
-msgstr ""
+msgstr "springt n sec vooruit"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:119
@@ -44659,5 +47040,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:119
 msgid "faster playback"
-msgstr ""
+msgstr "sneller afspelen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:127
@@ -44668,116 +47049,116 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:127
 msgid "slower playback"
-msgstr ""
+msgstr "langzamer afspelen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:135
 msgid "Jump To"
-msgstr ""
+msgstr "Spring naar"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:135
 msgid "jumps to the entered gps time"
-msgstr ""
+msgstr "springt naar de ingevoerde GPS-tijd"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:142
 msgid "Loop"
-msgstr ""
+msgstr "Herhalen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:142
 msgid "loops n sec around current position"
-msgstr ""
+msgstr "herhaalt n sec rondom de huidige positie"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:143
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:193
 msgid "loop"
-msgstr ""
+msgstr "herhalen"
 
 #. now the options menu
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:150
 msgid "Keep centered"
-msgstr ""
+msgstr "Gecentreerd houden"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:150
 msgid "follows the video icon automaticly"
-msgstr ""
+msgstr "volgt automatisch het pictogram van de video"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:156
 msgid "Subtitles"
-msgstr ""
+msgstr "Ondertitels"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:156
 msgid "Show subtitles in video"
-msgstr ""
+msgstr "Ondertitels weergeven in video"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:162
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:165
 msgid "Jump length"
-msgstr ""
+msgstr "Lengte sprong"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:162
 msgid "Set the length of a jump"
-msgstr ""
+msgstr "Stel de lengte van een sprong in"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:165
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:174
 msgid "Jump in video for x ms"
-msgstr ""
+msgstr "Sprong in video voor x ms"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:171
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:174
 msgid "Loop length"
-msgstr ""
+msgstr "Lengte herhaling"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:171
 msgid "Set the length around a looppoint"
-msgstr ""
+msgstr "Stel de lengte rondom een herhalingspunt in"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:181
 msgid "no deinterlacing"
-msgstr ""
+msgstr "geen de-interlacing"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:186
 msgid "deinterlacing using line doubling"
-msgstr ""
+msgstr "de-interlacing met behulp van lijnverdubbeling"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:191
 msgid "deinterlacing using linear interpolation"
-msgstr ""
+msgstr "de-interlacing met behulp van lineaire interpolatie"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:282
 msgid "Jump to"
-msgstr ""
+msgstr "Spring naar"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:302
 msgid "Jump to GPS time"
-msgstr ""
+msgstr "Spring naar GPS-tijd"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java:307
 msgid "Shows current position in the video"
-msgstr ""
+msgstr "geeft huidige positie in de video weer"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java:53
 msgid "Sync"
-msgstr ""
+msgstr "Synchroniseren"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:56
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:82
 msgid "Unable to find JNA Java library!"
-msgstr ""
+msgstr "Niet in staat om JNA Java-bibliotheek te vinden!"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:60
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:86
 msgid "Unable to find native libvlc library!"
-msgstr ""
+msgstr "Niet in staat om eigen libvlc-bibliotheek te vinden!"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:190
 msgid "play"
-msgstr ""
+msgstr "afspelen"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:194
 msgid "mute"
-msgstr ""
+msgstr "stil"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
-msgstr ""
+msgstr "Gescande kaart..."
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
@@ -44785,4 +47166,6 @@
 "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
+"Geeft een kaart weer die eerder was gescand en geüpload naar walking-papers."
+"org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
@@ -44790,32 +47173,34 @@
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
+"Voer een URL of ID (het gedeelte achter de ?id= in de URL) in voor walking-"
+"papers.org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
 #, java-format
 msgid "Could not read information from walking-papers.org the id \"{0}\""
-msgstr ""
+msgstr "Kon geen informatie lezen vanaf walking-papers.org voor de ID \"{0}\""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
-msgstr ""
+msgstr "Walking Papers: {0}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
-msgstr ""
+msgstr "Walking Papers-laag ({0}) in zoom {1}"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:30
 msgid "Walking Papers"
-msgstr ""
+msgstr "[DG]Walking Papers: {0}"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:56
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:59
 msgid "Way Download"
-msgstr ""
+msgstr "Download weg"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
 msgid "Download map data on the end of selected way"
-msgstr ""
+msgstr "Download kaartgegevens aan het einde van een geselecteerde weg"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:100
@@ -44825,13 +47210,17 @@
 "an entire way first.</html>"
 msgstr ""
+"<html>Een knoop noch een weg met een eindpunt buiten de<br>huidige "
+"downloadgebieden is geselecteerd.<br>Selecteer eerst een knoop aan het begin "
+"of einde van een weg of een gehele weg.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
+"<html>Kon geen unieke knoop vinden om downloaden te kunnen beginnen.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr ""
+msgstr "<html>Er zijn geen wegen verbonden aan knoop ''{0}''. Afbreken.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
@@ -44841,4 +47230,6 @@
 "discovered after download"
 msgstr ""
+"Inconsistentie in gegevens van Downloaden weg. De eerder verbonden weg "
+"''{0}'' werd niet gevonden na het downloaden"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:183
@@ -44851,54 +47242,325 @@
 "continue way downloading?</html>"
 msgstr ""
+"<html>Er zijn geen verder verbonden wegen om te downloaden.<br>Er werd "
+"echter een potentieel gedupliceerde knoop van de huidige geselecteerde knoop "
+"gevonden.<br><br>De huidige geselecteerde knoop is ''{0}''<br>De potentieel "
+"gedupliceerde knoop is ''{1}''<br>De gedupliceerde knoop samenvoegen met de "
+"huidige geselecteerde knoop en toch doorgaan met downloaden?</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
 msgid "Merge duplicate node?"
-msgstr ""
+msgstr "Gedupliceerde knoop samenvoegen?"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:213
 msgid "<html>No more connected ways to download.</html>"
-msgstr ""
+msgstr "<html>Geen verbonden wegen meer te downloaden.</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:222
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
-msgstr ""
+msgstr "Knoop ''{0}'' is een afslag met meer dan twee verbonden wegen."
 
 #. search field
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
 msgid "Enter search expression here.."
-msgstr ""
+msgstr "Voer hier een uitdrukking om te zoeken in.."
 
 #. add label
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56
 msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Selecteer wegpunt om kaart te verplaatsen"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Waypoint search"
-msgstr ""
+msgstr "Zoeken naar wegpunt"
 
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18
 msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr ""
+"Zoeken na wegpunt. Klik en verplaats de weergave van de kaart naar het "
+"wegpunt."
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:47
 msgid "Way Select"
-msgstr ""
+msgstr "Selecteer weg"
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:46
 msgid "Select non-branching sequences of ways"
-msgstr ""
+msgstr "Selecteer niet-aftakkende reeksen van wegen"
 
 #: ../plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java:43
 msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "De Ultimate WMS Super-speed Turbo Challenge II"
 
 #: ../plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java:42
 msgid "Go driving"
-msgstr ""
+msgstr "Begin te rijden"
 
 #: ../plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java:43
 msgid "Drive a race car on this layer"
-msgstr ""
+msgstr "Rijd met een raceauto over deze laag"
+
+#~ msgid "Overlapping areas"
+#~ msgstr "Overlappende gebieden"
+
+#~ msgid "NPE Maps"
+#~ msgstr "NPE-kaarten"
+
+#~ msgid "NPE Maps (Tim)"
+#~ msgstr "NPE-kaarten (Tim)"
+
+#~ msgid "Info about Element"
+#~ msgstr "Info over element"
+
+#~ msgid "Yahoo Sat"
+#~ msgstr "Yahoo Sat"
+
+#~ msgid "TilesAtHome"
+#~ msgstr "TilesAtHome"
+
+#~ msgid "Inspect"
+#~ msgstr "Inspecteren"
+
+#~ msgid "Near"
+#~ msgstr "Nabij"
+
+#~ msgctxt "placeselection"
+#~ msgid "Zoom"
+#~ msgstr "Inzoomen"
+
+#~ msgid "Display object information about OSM nodes, ways, or relations."
+#~ msgstr "Toon objectinformatie over wegen, knopen of relaties in OSM."
+
+#~ msgid "In conflict with:\n"
+#~ msgstr "In conflict met:\n"
+
+#~ msgid "; deleted"
+#~ msgstr "; verwijderd"
+
+#~ msgid "; filtered/disabled"
+#~ msgstr "; gefilterd/uitgeschakeld"
+
+#~ msgid "; filtered/hidden"
+#~ msgstr "; gefilterd/verborgen"
+
+#~ msgid "; modified"
+#~ msgstr "; gewijzigd"
+
+#~ msgid "; deleted-on-server"
+#~ msgstr "; verwijderd-op-server"
+
+#~ msgid " (reversed)"
+#~ msgstr " (omgekeerd)"
+
+#~ msgid " {0} name: {1}"
+#~ msgid_plural " {0} names: {1}"
+#~ msgstr[0] " {0} naam: {1}"
+#~ msgstr[1] " {0} namen: {1}"
+
+#~ msgid "id: {0}"
+#~ msgstr "id: {0}"
+
+#~ msgid " name: {0}"
+#~ msgstr " naam: {0}"
+
+#~ msgid "Object history"
+#~ msgstr "Geschiedenis van object"
+
+#~ 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] ""
+#~ "Kan {0} bestand niet openen omdat er geen geschikte toepassing voor "
+#~ "importeren van bestanden beschikbaar is."
+#~ msgstr[1] ""
+#~ "Kan {0} bestanden niet openen omdat er geen geschikte toepassing voor "
+#~ "importeren van bestanden beschikbaar is."
+
+#~ msgid "Node id={0}"
+#~ msgstr "Knoop-id={0}"
+
+#~ msgid " not in data set"
+#~ msgstr " niet in gegevensset"
+
+#~ msgid " incomplete\n"
+#~ msgstr " incompleet\n"
+
+#~ msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
+#~ msgstr " lat={0} lon={1} (geprojecteerd: x={2}, y={3}); "
+
+#~ msgid " {0} node; "
+#~ msgid_plural " {0} nodes; "
+#~ msgstr[0] " {0} knoop; "
+#~ msgstr[1] " {0} knopen; "
+
+#~ msgid "  nodes:\n"
+#~ msgstr "  knopen:\n"
+
+#~ msgid " {0} member; "
+#~ msgid_plural " {0} members; "
+#~ msgstr[0] " {0} lid; "
+#~ msgstr[1] " {0} leden; "
+
+#~ msgid "  members:\n"
+#~ msgstr "  leden:\n"
+
+#~ msgid ""
+#~ "Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: "
+#~ "{4}"
+#~ msgstr ""
+#~ "Gegevensset: {0}; Gebruiker: [{1}]; ID Wijzigingenset: {2}; Tijdstempel: "
+#~ "{3}; Versie: {4}"
+
+#~ msgid "; has direction keys"
+#~ msgstr "; heeft sleutels voor richting"
+
+#~ msgid "  tags:\n"
+#~ msgstr "  tags:\n"
+
+#~ msgid "  way referrer:\n"
+#~ msgstr "  verwijzing naar weg:\n"
+
+#~ msgid "  relation referrer:\n"
+#~ msgstr "  verwijzing naar relatie:\n"
+
+#~ msgid "Get detailed information on the internal state of the objects."
+#~ msgstr ""
+#~ "Haal gedetailleerde informatie over de interne status van de objecten op."
+
+#~ msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+#~ msgstr ""
+#~ "Waarschuwing: WMS-laag uitgeschakeld wegens niet goed gevormde basis URL "
+#~ "''{0}''"
+
+#~ msgid "(deactivated)"
+#~ msgstr "(uitgeschakeld)"
+
+#~ 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 ""
+#~ "<html>De basis URL<br>''{0}''<br>voor deze WMS-laag eindigt noch op een "
+#~ "''&'' noch met een ''?''.<br>Dit zal vermoedelijk leiden tot een ongeldig "
+#~ "verzoek aan WMS. U zou uw <br>instellingen voor voorkeuren moeten "
+#~ "controleren.<br>Wilt u toch tegels van WMS verkrijgen?</html>"
+
+#~ msgid "Yes, fetch images"
+#~ msgstr "Ja, haal de afbeeldingen op"
+
+#~ msgid "Invalid URL?"
+#~ msgstr "Ongeldige URL?"
+
+#~ msgid "Save Access Token to preferences"
+#~ msgstr "Sla Toegangstoken op in de voorkeuren"
+
+#~ msgid ""
+#~ "Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing "
+#~ "''&'' or a trailing ''?''."
+#~ msgstr ""
+#~ "Waarschuwing: De basis URL ''{0}'' voor een WMS-dienst heeft geen ''&'' "
+#~ "of een ''?'' achteraan."
+
+#~ msgid ""
+#~ "Warning: Fetching WMS tiles is likely to fail. Please check you "
+#~ "preference settings."
+#~ msgstr ""
+#~ "Waarschuwing: Ophalen van WMS-tegels zal waarschijnlijk mislukken. "
+#~ "Controleer uw instellingen voor de voorkeuren."
+
+#~ msgid "Warning: The complete URL is ''{0}''."
+#~ msgstr "Waarschuwing: De volledige URL is ''{0}''."
+
+#~ msgid ""
+#~ "The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+#~ "This may lead to wrong coordinates."
+#~ msgstr ""
+#~ "De projectie ''{0}'' in URL en de huidige projectie ''{1}'' komen niet "
+#~ "overeen.\n"
+#~ "Dit kan leiden tot verkeerde coördinaten."
+
+#~ msgid "Diameter"
+#~ msgstr "Diameter"
+
+#~ msgid "Pressure"
+#~ msgstr "Druk"
+
+#~ msgid "xx l/min"
+#~ msgstr "xx l/min"
+
+#~ msgid "Open Aerial Map"
+#~ msgstr "Open Aerial-kaart"
+
+#~ msgid "German Style"
+#~ msgstr "Duitse stijl"
+
+#~ msgid "Sorbische Karte"
+#~ msgstr "Sorbische Karte"
+
+#~ msgid "Deutsche Karte"
+#~ msgstr "Deutsche Karte"
+
+#~ msgid "Bayern (2m)"
+#~ msgstr "Beieren (2m)"
+
+#~ msgid "Geoimage.at"
+#~ msgstr "Geoimage.at"
+
+#~ msgid "Geoimage.at (HighRes)"
+#~ msgstr "Geoimage.at (HighRes)"
+
+#~ msgid "MLIT Japan (ORTHO)"
+#~ msgstr "MLIT Japan (ORTHO)"
+
+#~ 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 "SPOTMaps (France)"
+#~ msgstr "SPOTMaps (Frankrijk)"
+
+#~ msgid "Pangasinan (Phillipines HiRes)"
+#~ msgstr "Pangasinan (Fillipijnse HiRes)"
+
+#~ msgid "Way id={0}"
+#~ msgstr "Weg-ID={0}"
+
+#~ msgid "Relation id={0}"
+#~ msgstr "Relatie-ID={0}"
+
+#~ msgid ""
+#~ "Warning: Could not detect type of imagery source ''{0}''. Using default "
+#~ "(xml)."
+#~ msgstr ""
+#~ "Waarschuwing: Kon type van bron voor afbeelding niet detecteren ''{0}''. "
+#~ "Standaard gebruiken (xml)."
+
+#~ msgid "Wood Fence"
+#~ msgstr "Houten omheining"
+
+#~ msgid "Wire Fence"
+#~ msgstr "Omheining van draad"
+
+#~ msgid "ÖPNV"
+#~ msgstr "ÖPNV"
+
+#~ 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 ""
+#~ "U kunt een aangepaste URL openen voor <b>één</b> geselecteerd object<br/> "
+#~ "<b>&#123;key&#125;</b> wordt vervangen door de tagwaarde<br/> <b>&#123;"
+#~ "#id&#125;</b> wordt vervangen door de ID van het element<br/> <b>&#123;"
+#~ "#type&#125;</b> wordt vervangen door \"knoop\",\"weg\" of \"relatie\" <br/"
+#~ "> <b>&#123;#lat&#125; , &#123;#lon&#125;</b> wordt vervangen door het "
+#~ "element latitude/longitude"