Changeset 26587 in osm for applications/editors/josm/i18n/po/nl.po

Timestamp:

2011-08-28T16:18:41+02:00 (13 years ago)

Author:

stoecker

Message:

i18n update

File:

• applications/editors/josm/i18n/po/nl.po (modified) (1003 diffs)

applications/editors/josm/i18n/po/nl.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-11 23:27+0200\n"
-"PO-Revision-Date: 2011-07-20 11:14+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2011-08-28 16:10+0200\n"
+"PO-Revision-Date: 2011-08-19 16:50+0000\n"
+"Last-Translator: DiGro <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "Language: nl\n"
@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-08-11 16:42+0000\n"
-"X-Generator: Launchpad (build 13662)\n"
+"X-Launchpad-Export-Date: 2011-08-28 11:56+0000\n"
+"X-Generator: Launchpad (build 13794)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -47 +47 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:221
 #: ../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/OrthogonalizeAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
@@ -68 +68 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:315
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:234
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:310
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:603
@@ -77 +77 @@
 #: ../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/layer/GpxLayer.java:787
+#: ../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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:334
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445
@@ -98 +98 @@
 #: ../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/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145
@@ -151 +153 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:335
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:378
+#: ../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
@@ -166 +168 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1101
+#: ../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:888
+#: ../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
@@ -184 +186 @@
 #: ../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:1270
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1280
+#: ../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/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
@@ -250 +252 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:72
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:106
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:238
@@ -291 +293 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:534
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:553
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:542
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -368 +370 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:158
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:225
@@ -377 +379 @@
 #: ../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:104
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:217
+#: ../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/search/SearchAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
@@ -390 +392 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
+#: ../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:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -407 +409 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -416 +419 @@
 #: ../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:1413
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
+#: ../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/TaggingPresetSearchDialog.java:211
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118
@@ -438 +441 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
+#: ../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/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462
@@ -475 +479 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:640
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:673
 msgid "Merge"
 msgstr "Samenvoegen"
@@ -498 +502 @@
 msgstr "(Lucht)fotolaag {0} toevoegen als achtergrondafbeelding"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 msgid "Add Node..."
 msgstr "Knooppunt toevoegen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
-msgid "Add a node by entering latitude and longitude."
-msgstr "Knooppunt toevoegen door invoeren lengte- en breedtegraad."
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
+msgid "Add a node by entering latitude / longitude or easting / northing."
+msgstr ""
 
 #. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
@@ -517 +522 @@
 #. * for now this is a reasonable approximation.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
@@ -583 +588 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:57
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
@@ -635 +641 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:175
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
@@ -672 +678 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:79
 msgid "data"
 msgstr "gegevens"
@@ -685 +691 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:59
 msgid "conflict"
 msgstr "conflict"
@@ -739 +745 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:378
 msgid "Close open changesets"
 msgstr "Sluit open wijzigingensets"
@@ -750 +756 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
@@ -864 +870 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:103
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:117
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:32
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:89
@@ -875 +881 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:60
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:90
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:89
 msgid "No data loaded."
 msgstr "Geen gegevens geladen."
@@ -888 +894 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:643
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1047
+#: ../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/relation/GenericRelationEditor.java:1053
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
@@ -901 +907 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/GraphViewPreferenceEditor.java:186
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:804
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:927
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:516
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:815
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:938
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:428
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:132
@@ -925 +931 @@
 #: ../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:216
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:217
+#: ../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
@@ -933 +939 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105
 msgid "File exists. Overwrite?"
@@ -958 +964 @@
 msgstr "Kaartgegevens downloaden van de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:60
 msgid "Download object..."
 msgstr "Object downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:59
 msgid "Download OSM object by ID."
 msgstr "OSM-object op basis van ID afhalen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:95
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:82
 msgid "Object type:"
 msgstr "Objecttype:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:97
 msgctxt "osm object types"
 msgid "mixed"
 msgstr "gemengd"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:98
 msgid "Choose the OSM object type"
 msgstr "Kies het type van het OSM-object"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:90
 msgid "Object ID:"
 msgstr "Object-ID:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:108
 msgid "Enter the ID of the object that should be downloaded"
 msgstr "Voer het ID van het te downloaden object in"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:73
@@ -996 +1002 @@
 msgstr "Laag scheiden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:113
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:71
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
 #: ../plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java:31
 msgid "Download referrers"
 msgstr "Referrers downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:80
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:118
 msgid ""
 "Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
@@ -1021 +1027 @@
 "in gemengde modus objecten als volgt: <b>w123, n110, w12, r15</b><br/>"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:152
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/DownloadPrimitiveTask.java:45
 msgid "Download object"
 msgstr "Object downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:157
 msgid "Start downloading"
 msgstr "Downloaden starten"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:158
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:96
 msgid "Close dialog and cancel downloading"
 msgstr "Sluit dialoog en stop het downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:173
 msgid ""
 "Invalid ID list specified\n"
@@ -1044 +1050 @@
 " Kan het object niet ophalen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:205
 msgid "Object could not be downloaded"
 msgid_plural "Some objects could not be downloaded"
@@ -1050 +1056 @@
 msgstr[1] "Enkele objecten kunnen niet opgehaald worden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:206
 #, java-format
 msgid "One object could not be downloaded.<br>"
@@ -1057 +1063 @@
 msgstr[1] "{0} objecten kunnen niet opgehaald worden.<br>"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:176
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:210
 msgid ""
 "The server replied with response code 404.<br>This usually means, the server "
@@ -1065 +1071 @@
 "in dat de server het object met opgevraagde ID niet kent."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:212
 msgid "missing objects:"
 msgstr "ontbrekende objecten:"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:237
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:462
 msgid "Object deleted"
@@ -1076 +1082 @@
 msgstr[1] "Objecten verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:239
 #, java-format
 msgid "One downloaded object is deleted."
@@ -1085 +1091 @@
 #. content.add(scroller);
 #. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:24
@@ -1105 +1112 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:707
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:740
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1444
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:524
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:530
 msgid "Duplicate"
 msgstr "Dupliceren"
@@ -1227 +1234 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67
@@ -1480 +1486 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "URL"
@@ -1547 +1554 @@
 "again."
 msgstr ""
+"De ingevoerde koppeling of id voor de geselecteerde service komt niet "
+"overeen. Probeer opnieuw."
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:211
@@ -1577 +1586 @@
 "dat dicht bij een andere ligt."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:175
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:209
 msgid "Abort Merging"
 msgstr "Stop samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:211
 msgid "Click to abort merging nodes"
 msgstr "Klik om samenvoegen van knooppunten te stoppen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:218
 #, java-format
 msgid ""
@@ -1593 +1602 @@
 "is in gebruik"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:319
 #, java-format
 msgid "Merge {0} nodes"
@@ -1622 +1631 @@
 msgstr "Selecteer ten minste één knoop of weg."
 
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:52
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
 msgid "up"
 msgstr "omhoog"
 
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:54
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
 msgid "down"
 msgstr "omlaag"
@@ -1663 +1738 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:417
 msgid "Cannot move objects outside of the world."
 msgstr "Kan objecten niet buiten de wereld plaatsen."
@@ -1728 +1803 @@
 msgstr "Bestand openen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:288
 msgid "Opening 1 file..."
 msgstr "Bezig met 1 bestand te openen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290
 #, java-format
 msgid "Opening {0} file..."
@@ -1739 +1814 @@
 msgstr[1] "{0} bestanden aan het openen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:300
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1997 +2072 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
 msgid "Redo"
 msgstr "Opnieuw uitvoeren"
@@ -2048 +2123 @@
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
+#: ../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
@@ -2064 +2139 @@
 msgstr "Het bestand {0} bestaat al. Overschrijven?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
 msgid "No Exporter found! Nothing saved."
 msgstr "Geen exporter gevonden! Niets opgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
 msgid "Empty document"
 msgstr "Leeg document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 msgid "Save anyway"
 msgstr "Toch opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:106
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 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:117
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
 msgid "Conflicts"
 msgstr "Conflicten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
 msgid "Reject Conflicts and Save"
 msgstr "Conflicten verwerpen en opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -2097 +2172 @@
 "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:132
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141
 msgid "Save OSM file"
 msgstr "OSM-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
 msgid "Save GPX file"
 msgstr "GPX-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:135
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
 msgid "Save Layer"
 msgstr "Laag opslaan"
@@ -2157 +2232 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:65
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
@@ -2218 +2293 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -2318 +2393 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:446
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:494
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -2327 +2403 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:452
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:500
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -2441 +2518 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:367
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:206
 msgid "Undo"
@@ -2488 +2565 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1288
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:881
@@ -2620 +2697 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:99
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:96
 msgid "Wireframe View"
 msgstr "Draadmodelweergave"
@@ -2748 +2825 @@
 "Ignoring exception because download has been canceled. Exception was: {0}"
 msgstr ""
+"Uitzondering genegeerd omdat de download is geannuleerd. Uitzondering was: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
@@ -2775 +2854 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:121
 msgid "Ignore"
 msgstr "Negeren"
@@ -2868 +2947 @@
 msgstr "Fout tijdens het downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete Mode"
 msgstr "Verwijdermodus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 msgid "Delete nodes or ways."
 msgstr "Knopen of wegen verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:83
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:129
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:129
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:96
@@ -2893 +2972 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:289
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
@@ -2901 +2980 @@
 "behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:83
 msgid "Draw"
 msgstr "Tekenen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:82
 msgid "Draw nodes"
 msgstr "Knopen tekenen"
 
 #. Add extra shortcut N
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:87
 msgid "Mode: Draw Focus"
 msgstr "Modus: tekenmodus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:309
 msgid "Cannot add a node outside of the world."
 msgstr "Kan geen knoop buiten de wereld toevoegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:489
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:484
 msgid "Add node"
 msgstr "Knooppunt toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:491
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:486
 msgid "Add node into way"
 msgstr "Knoop in weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:494
 msgid "Connect existing way to node"
 msgstr "Bestaande weg aan knoop koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:368
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:496
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:370
 msgid "Add a new node to an existing way"
 msgstr "Een nieuwe knoop aan een bestaande weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:503
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:498
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:905
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:895
 #, java-format
 msgid "Insert new node into way."
@@ -2956 +3035 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:907
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:919
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
@@ -2995 +3074 @@
 "node."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+"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."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:354
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
 msgid "Extrude Way"
 msgstr "Weg uittrekken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:124
 msgid "Parallel"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:128
+msgstr "Parallel"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:123
 msgid "Make parallel copies of ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:187
+msgstr "Maak parallelle kopieën van wegen"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:182
 msgid ""
 "Select ways as in Select mode. Drag selected ways or a single way to create "
 "a parallel copy (Alt toggles tag preservation)"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:189
+"Selecteer wegen zoals in modus Selecteren. Sleep geselecteerde wegen of een "
+"enkele weg om een parallelle kopie te maken (Alt wisselt het behouden van "
+"tags)"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:184
 msgid "Hold Ctrl to toggle snapping"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:542
+msgstr "Houd Ctrl ingedrukt om te wisseln met vangen"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:534
 msgid ""
 "ParallelWayAction\n"
 "The ways selected must form a simple branchless path"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:544
+"ParallelWayAction\n"
+"De geselecteerde wegen moeten één eenvoudige pad zonder aftakkingen vormen"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java:536
 msgid "Make parallel way error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
+msgstr "Fout bij maken parallelle weg"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:28
 msgid "Drag play head"
 msgstr "Speelkop verslepen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:83
 msgid ""
 "Drag play head and release near track to play audio from there; SHIFT"
@@ -3042 +3129 @@
 "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:297
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:306
+#: ../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/UserListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:109
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
@@ -3058 +3145 @@
 msgstr "Selecteer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:146
 msgid "Select, move, scale and rotate objects"
 msgstr "Selecteer, verplaats, schaal en roteer objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:379
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -3069 +3156 @@
 msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:523
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:721
 msgid "Move elements"
 msgstr "Verplaats elementen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
 msgid "Move them"
 msgstr "Verplaats ze"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:722
 msgid "Undo move"
 msgstr "Verplaatsing ongedaan maken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:724
 #, java-format
 msgid ""
@@ -3092 +3179 @@
 "Wilt u ze echt verplaatsen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:669
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:871
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om de objecten in de rechthoek te selecteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:671
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:873
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -3103 +3190 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:673
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:875
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:675
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:877
 msgid "Release the mouse button to stop scaling."
 msgstr "De muisknop loslaten om het herschalen te stoppen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:677
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:879
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3137 +3224 @@
 "omlaag, rechts; verplaats met rechter knop"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<not>"
 msgstr "<niet>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<or>"
 msgstr "<of>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
 msgid "<left parent>"
 msgstr "<linkse ouder>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<right parent>"
 msgstr "<rechtse ouder>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<colon>"
 msgstr "<dubbelpunt>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
 msgid "<equals>"
 msgstr "<is gelijk aan>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
 msgid "<key>"
 msgstr "<sleutel>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
 msgid "<question mark>"
 msgstr "<vraagteken>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:52
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:53
 msgid "<end-of-file>"
 msgstr "<bestandseinde>"
@@ -3184 +3271 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "Filter string:"
 msgstr "Filterregel"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "Search string:"
 msgstr "Zoektekst:"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165
 msgid "Enter the search expression"
 msgstr "Geef de zoekterm"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:174
 msgid "replace selection"
 msgstr "Selectie vervangen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "add to selection"
 msgstr "Toevoegen aan selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "remove from selection"
 msgstr "Verwijderen uit selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "find in selection"
 msgstr "zoek in selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "all objects"
 msgstr "alle objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "Also include incomplete and deleted objects in search."
 msgstr "Onvolledige en verwijderde objecten ook doorzoeken."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "regular expression"
 msgstr "Reguliere expressie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Bakkerstraat\"</b> - ''Bakkerstraat'' in een sleutel of naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Lange</b> - ''Lange'' ergens in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - sleutel ''type'' met exacte waarde ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -3252 +3339 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Lang</b> - geen ''Lang'' in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes, true, 1 of on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - sleutel=foot, met een willekeurige waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
-msgid "<u>Special targets:</u>"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#, fuzzy
+msgid "Special targets"
 msgstr "<u>Speciale zoekopdrachten:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
+#, fuzzy
+msgid ""
+"<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, "
+"<b>relation</b>)"
 msgstr "<b>type:</b> - objecttype (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
-msgid "<b>user:</b>... - all objects changed by user"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#, fuzzy
+msgid "<b>user:</b>... - objects changed by user"
 msgstr "<b>user:</b>... - alle objecten veranderd door bepaalde gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
-msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#, fuzzy
+msgid "<b>user:anonymous</b> - objects changed by anonymous users"
 msgstr ""
 "<b>user:anonymous</b> - alle objecten gewijzigd door anonieme gebruikers"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#, fuzzy
+msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - object met opgegeven ID (0 voor nieuwe objecten)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
-msgid ""
-"<b>version:</b>... - object with given version (0 objects without an "
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
+#, fuzzy
+msgid ""
+"<b>version:</b>... - objects with given version (0 objects without an "
 "assigned version)"
 msgstr ""
@@ -3294 +3393 @@
 "toegewezen versie)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
-msgid ""
-"<b>changeset:</b>... - object with given changeset id (0 objects without "
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#, fuzzy
+msgid ""
+"<b>changeset:</b>... - objects with given changeset id (0 objects without "
 "assigned changeset)"
 msgstr ""
@@ -3302 +3403 @@
 "objecten zonder een toegewezen wijzigingenset)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#, fuzzy
+msgid ""
+"<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:"
+"min-max, nodes:min- or nodes:-max)"
 msgstr ""
 "<b>nodes:</b>... - object met een gegeven aantal knopen (nodes:count of "
 "nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
-msgid ""
-"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
-"max)"
-msgstr ""
-"<b>tags:</b>... - objekt met bepaald aantal tags (tags:aantal of tags:min-"
-"max)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
-msgid "<b>role:</b>... - object with given role in a relation"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-"
+"max, nodes:min- or nodes:-max)"
+msgstr ""
+"<b>nodes:</b>... - object met een gegeven aantal knopen (nodes:count of "
+"nodes:min-max)"
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
+#, fuzzy
+msgid "<b>role:</b>... - objects with given role in a relation"
 msgstr "<b>role:</b>... - object met een bepaalde rol in een relatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
-msgid ""
-"<b>timestamp:</b>... -  objects with this timestamp "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:222
+#, fuzzy
+msgid ""
+"<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</"
+"b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
 "<b>timestamp:</b>... - objecten met timestamp (<b>2009-11-12T14:51:09Z</b>, "
 "<b>2009-11-12</b> or <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>areasize:</b>... - closed ways with area between MIN and MAX m². "
-"(areasize:MIN-MAX or areasize:MAX)"
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
+#, fuzzy
+msgid ""
+"<b>areasize:</b>... - closed ways with given area in m² (areasize:min-max or "
+"areasize:max)"
 msgstr ""
 "<b>gebiedsgrootte:</b>... - gesloten wegen met gebied tussen MIN en MAX m². "
 "(gebiedsgrootte:MIN-MAX of gebiedsgrootte:MAX)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:224
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle aangepaste objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle geselecteerde objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:226
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle incomplete objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#. I18n: don't translate the bold text keyword
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:228
 msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
 msgstr ""
@@ -3360 +3476 @@
 "weg beschouwd)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:229
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -3367 +3484 @@
 "voldoen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:230
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -3374 +3492 @@
 "voldoen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
+msgid ""
+"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
+"members) in downloaded area"
+msgstr ""
+
+#. I18n: don't translate the bold text keyword
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+msgid ""
+"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
+"current view"
+msgstr ""
+
+#. 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"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -3384 +3517 @@
 "bevat)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -3392 +3525 @@
 "<b>\\</b> gezet worden. (bijv. <b>\\\"</b> en <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Gebruik <b>(</b> en <b>)</b> om expressies te groeperen"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:65
 #: build/specialmessages.java:60
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:81
@@ -3407 +3540 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:251
 msgid "Submit filter"
 msgstr "Activeer filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:251
 msgid "Start Search"
 msgstr "Start zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:263
 #, java-format
 msgid ""
@@ -3428 +3561 @@
 msgstr "Zoekexpressie is niet geldig: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
 msgid "Invalid search expression"
 msgstr "Ongeldige zoekexpressie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Geen overeenkomst gevonden voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:416
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:444
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:446
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Niets gevonden in selectie met zoeken op \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:430
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:456
 #, java-format
 msgid "Found {0} matches"
@@ -3458 +3591 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:463
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:489
 msgctxt "search"
 msgid "CS"
@@ -3464 +3597 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:464
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:490
 msgctxt "search"
 msgid "CI"
@@ -3470 +3603 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:492
 msgctxt "search"
 msgid "RX"
@@ -3476 +3609 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:494
 msgctxt "search"
 msgid "A"
 msgstr "A (alle)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:53
 #, java-format
 msgid ""
@@ -3493 +3626 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:52
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:54
 #, java-format
 msgid ""
@@ -3504 +3637 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:290
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -3510 +3643 @@
 "van gebruik: sleutel=waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:450
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:476
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3516 +3649 @@
 "Onbekende primitief: {0}. Toegestane waarden zijn knoop, weg of relatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:665
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:796
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Onverwacht teken. {0} werd verwacht, {1} werd gevonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:680
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:811
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Onverwacht teken: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:822
 msgid "Missing parameter for OR"
 msgstr "Parameter voor OF ontbreekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:847
 msgid "Missing operator for NOT"
 msgstr "Operator voor NIET ontbreekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:723
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:854
 msgid "Primitive id expected"
 msgstr "ID van basistype werd verwacht"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:725
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:728
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:856
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:859
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:862
 msgid "Range of numbers expected"
 msgstr "Een bereik van getallen werd verwacht"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:734
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:865
 msgid "Changeset id expected"
 msgstr "ID van veranderingsset werd verwacht"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:736
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:867
 msgid "Version expected"
 msgstr "Versie werd verwacht"
@@ -3624 +3757 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:120
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:550
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:556
 msgid "Errors"
 msgstr "Fouten"
@@ -3649 +3782 @@
 #: ../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:1576 build/trans_presets.java:3463
+#: build/trans_presets.java:1710 build/trans_presets.java:3619
 msgid "Other"
 msgstr "Andere"
@@ -3659 +3792 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
 msgid "Suspicious data found. Upload anyway?"
-msgstr ""
+msgstr "verdacht gegevens gevonden. Toch uploaden?"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -4201 +4334 @@
 "to default: {0}"
 msgstr ""
+"Waarschuwing: Initialiseren van voorkeuren mislukt. Mislukt om bestand met "
+"voorkeuren herstellen naar standaard: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:557
@@ -4236 +4371 @@
 "Warning: unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
+"Waarschuwing: onverwacht versienummer voor JOSM in revisiebestand, waarde is "
+"''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -4329 +4466 @@
 msgstr "Een primitief met ID = 0 kan niet onzichtbaar zijn."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333
 #, java-format
 msgid ""
@@ -4337 +4474 @@
 "deze er al deel van uitmaakt"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:737
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804
 #, java-format
 msgid ""
@@ -4344 +4481 @@
 "error, it should be safe to continue in your work."
 msgstr ""
+"JOSM verwachte primitieve [{0} {1}] te vinden in gegevensset maar dat is er "
+"niet. Rapporteer dit alstublieft bij http://josm.openstreetmap.de/. Dit is "
+"geen kritische fout, het zou veilig moeten zijn om uw werk te vervolgen."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -4360 +4500 @@
 "in the source dataset"
 msgstr ""
+"Object van het type {0} met id {1} werd gemarkeerd om te worden verwijderd, "
+"maar het ontbreekt in de bron-gegevensset"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:247
@@ -4390 +4532 @@
 msgid "Conflict in ''visible'' attribute for object of type {0} with id {1}"
 msgstr ""
+"Conflict in het attribuut ''visible'' voor object van het type {0} met id {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:118
@@ -4473 +4616 @@
 "sleutel zijn met meerdere waardes."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:355
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:383
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:356
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:384
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -4480 +4623 @@
 "Knooppunt {0} kan niet aan onvolledig afgehaalde weg {1} worden toegevoegd."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:135
 #, java-format
 msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
@@ -4487 +4630 @@
 "''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:52
 #, java-format
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
@@ -4586 +4729 @@
 #. darker blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
@@ -4595 +4738 @@
 msgstr "markeren"
 
-#. lighteal
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:30
 msgid "untagged"
@@ -4620 +4762 @@
 msgid "Error: failed to open input stream for resource ''/data/{0}''."
 msgstr ""
+"Fout: mislukt om een invoerstroom te openen voor de bron ''/data/{0}''."
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:74
 msgid "Gauß-Krüger"
-msgstr ""
+msgstr "Gauß-Krüger"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussKrueger.java:98
 msgid "GK Zone"
-msgstr ""
+msgstr "GK Zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:88
@@ -4635 +4778 @@
 "NTF<->RGF93 grid"
 msgstr ""
+"Error: failed to open input stream for resource ''/data/{0}''. Cannot load "
+"NTF<->RGF93 grid"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
@@ -4723 +4868 @@
 msgstr "Zwitsers raster (Zwitserland)"
 
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:71
+msgid "<i>CH1903 / LV03 (without local corrections)</i>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:30
 msgid "LKS-92 (Latvia TM)"
@@ -4782 +4931 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java:18
 msgid "GRS80"
-msgstr ""
+msgstr "GRS80"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java:17
 msgid "WGS84"
-msgstr ""
+msgstr "WGS84"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java:122
 msgid "Lambert Conformal Conic"
-msgstr ""
+msgstr "Lambert Conformal Conic"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java:46
 msgid "Swiss Oblique Mercator"
-msgstr ""
+msgstr "Swiss Oblique Mercator"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java:28
 msgid "Transverse Mercator"
-msgstr ""
+msgstr "Transverse Mercator"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265
@@ -4954 +5103 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:138
 msgid "Duplicated relations."
-msgstr ""
+msgstr "Gedupliceerde relaties."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:139
@@ -5014 +5163 @@
 #. item "Relations/Multipolygon"
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51
-#: build/trans_presets.java:4096
+#: build/trans_presets.java:4259
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -5026 +5175 @@
 msgstr "Gebied is niet gesloten"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:139
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:146
 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:175
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:182
 msgid "No style for multipolygon"
 msgstr "Multipolygoonrelatie ontbreekt stijlinformatie"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:177
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:184
 msgid "No style in multipolygon relation"
 msgstr "Multipolygoonrelatie ontbreekt stijlinformatie"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:195
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202
 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:212
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219
 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:221
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:228
 msgid "Multipolygon is not closed"
 msgstr "Multipolygoon is niet gesloten"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:244
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:251
 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:247
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:254
 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:258
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:265
 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:262
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:269
 msgid "Non-Way in multipolygon"
 msgstr "Multipolygoonrelatie bevat een lid dat geen ''weg'' is"
@@ -5078 +5227 @@
 "e.g., Italia - Italien - Italy."
 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."
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java:47
@@ -5338 +5490 @@
 #. JButton
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1080
+#: ../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/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:466
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:790
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:913
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:801
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:924
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:414
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
@@ -5361 +5513 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
+#: ../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/relation/ChildRelationBrowser.java:177
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -5482 +5634 @@
 msgstr "Ongeldige reguliere expressie ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:35
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:39
 msgid "Turnrestriction"
 msgstr "Beperking op afslaan"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:35
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:39
 msgid "This test checks if turnrestrictions are valid"
 msgstr ""
@@ -5492 +5644 @@
 "kruispunten, correct kunnen zijn"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:84
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:96
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:89
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:105
 msgid "Unknown role"
 msgstr "Onbekende rol"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:100
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:109
 msgid "Unknown member type"
 msgstr "Onbekend type voor lid van relatie"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:105
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:108
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:111
-msgid "More than one \"via\" way found"
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:120
+#, fuzzy
+msgid "More than one \"via\" node found"
 msgstr "Er werd meer dan 1 lid met als rol \"via\" gevonden"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:115
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
+msgid "Cannot mix node and way for role \"via\""
+msgstr ""
+
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:119
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:123
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:132
+#: ../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 ""
@@ -5531 +5688 @@
 "\"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:137
+#: ../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 ""
@@ -5537 +5694 @@
 "\"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:167
-msgid "The \"from\" way does not start or end at a \"via\" way."
-msgstr ""
-"Het lid met als rol \"from\" start of eindigt niet bij een lid met als rol "
-"\"via\""
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:172
-msgid "The \"to\" way does not start or end at a \"via\" way."
-msgstr ""
-"Het lid met als rol \"to\" start of eindigt niet bij een lid met als rol "
-"\"via\""
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:151
+msgid "The \"from\" and the first \"via\" way are not connected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:157
+msgid "The \"via\" ways are not connected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:161
+msgid "The last \"via\" and the \"to\" way are not connected."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32
@@ -5764 +5921 @@
 msgstr "Éénknoopswegen"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:31
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:29
 msgid "Wrongly Ordered Ways."
 msgstr "Verkeerd geordende wegen."
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:32
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:60
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:43
 msgid "Reversed coastline: land not on left side"
 msgstr "Omgekeerde kustlijn: land niet aan linker zijde"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:63
-msgid "Reversed water: land not on left side"
-msgstr "Omgekeerd water: land niet aan linker zijde"
-
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:66
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:47
 msgid "Reversed land: land not on left side"
 msgstr "Omgekeerde land: land niet aan linker zijde"
@@ -5863 +6016 @@
 
 #. 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:4149
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "railway"
 msgstr "spoorweg"
@@ -5885 +6039 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:769
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422
@@ -5945 +6099 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
 msgid "Conflict"
 msgstr "Conflict"
@@ -5982 +6136 @@
 msgstr "Toon help informatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
 msgid "Message of the day not available"
 msgstr "Melding van de dag niet beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:104
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:107
 msgid "Downloading \"Message of the day\""
 msgstr "\"Dagmelding\" downloaden"
@@ -6271 +6425 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
 msgid "Tools"
@@ -6492 +6647 @@
 #: ../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:649
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:730
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:853
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:741
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:864
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:393
@@ -6542 +6697 @@
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450
@@ -6570 +6729 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:14
 msgid "Conflict background: no conflict"
-msgstr ""
+msgstr "Conflict achtergrond: geen conflict"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:15
 msgid "Conflict background: decided"
-msgstr ""
+msgstr "Conflict achterground: bepaald"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:16
@@ -6622 +6781 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:29
 msgid "Conflict foreground: in comparison"
-msgstr ""
+msgstr "Conflict op voorgrond: in vergelijking"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:30
 msgid "Conflict background"
-msgstr ""
+msgstr "Conflict op achtergrond"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:31
 msgid "Conflict foreground"
-msgstr ""
+msgstr "Conflict op voorgrond"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:33
 msgid "Conflict background: not in opposite"
-msgstr ""
+msgstr "Conflict op achtergrond: niet tegengesteld"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:34
 msgid "Conflict background: in opposite"
-msgstr ""
+msgstr "Conflict op achtergrond: tegengesteld"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java:35
 msgid "Conflict background: same position in opposite"
-msgstr ""
+msgstr "Conflict op achtergrond: zelfde positie tegengesteld"
 
 #. *
@@ -6681 +6840 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:434
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:440
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
 msgid "Tags"
@@ -6835 +6994 @@
 "merge decisions are applied."
 msgstr ""
+"Lijst van samengevoegde elementen. Zij zullen de lijst van mijn elementen "
+"vervangen als de beslissingen om samen te voegen worden toegepast."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:291
@@ -6920 +7081 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:695
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:153
 #: build/specialmessages.java:85
 msgid "Up"
@@ -6930 +7091 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:163
 msgid "Down"
 msgstr "Omlaag"
@@ -7055 +7216 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:106
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:78
 msgid "Coordinates:"
 msgstr "Coördinaten:"
@@ -7087 +7248 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:396
 msgid "Keep my coordinates"
-msgstr ""
+msgstr "Behoud mijn coördinaten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
 msgid "Keep their coordinates"
-msgstr ""
+msgstr "Behoud hun coördinaten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:426
@@ -7149 +7310 @@
 #: ../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:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116
@@ -7157 +7318 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:147
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:106
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:570
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:637
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:691
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:576
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:643
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:702
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -7170 +7331 @@
 #: ../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:604
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78
@@ -7177 +7338 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:147
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:109
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:571
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:638
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:692
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:577
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:644
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:703
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -7223 +7384 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:132
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:175
 msgid "Conflicts when combining primitives"
 msgstr "Conflicten bij het combineren van primitieven"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:136
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:179
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
@@ -7232 +7395 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:141
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:184
 #, java-format
 msgid "Conflicts when merging nodes - target node is ''{0}''"
@@ -7238 +7402 @@
 
 #: ../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"
@@ -7243 +7408 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:268
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:388
 msgid "Cancel conflict resolution"
 msgstr "Conflictoplossing afbreken"
@@ -7248 +7414 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:283
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:403
 msgid "Apply resolved conflicts"
 msgstr "Conflictoplossing toepassen"
@@ -7256 +7423 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:46
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:404
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:867
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:644
@@ -7271 +7440 @@
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291
 msgid "all"
@@ -7354 +7523 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:457
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427
@@ -7364 +7533 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:458
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:773
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
 #, java-format
@@ -7398 +7567 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:802
 msgid "Role:"
 msgstr "Rol:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:804
 msgid "Enter a role for all relation memberships"
 msgstr "Geef een rol op voor alle relatielidmaatschappen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:821
 msgid "Tag modified relations with "
 msgstr "Markeer de gewijzigde relaties met "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:824
 msgid ""
 "<html>Select to enable entering a tag which will be applied<br>to all "
@@ -7418 +7591 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:827
 msgctxt "tag"
 msgid "Key:"
@@ -7423 +7597 @@
 
 #: ../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>"
@@ -7429 +7604 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 #: build/specialmessages.java:98
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:830
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:150
 msgid "Value:"
@@ -7434 +7610 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:832
 msgid ""
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
@@ -7441 +7618 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:844
 msgid ""
 "<html>The combined ways are members in one ore more relations. Please decide "
@@ -7458 +7636 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:855
 msgid ""
 "<html>The merged nodes are members in one ore more relations. Please decide "
@@ -7476 +7655 @@
 
 #: ../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"
@@ -7488 +7668 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
+#: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:1272
 msgid "<html>Please select the values to keep for the following tags.</html>"
 msgstr ""
@@ -7494 +7675 @@
 
 #: ../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"
 
 #: ../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:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
 msgid "For selected objects only"
 msgstr "Enkel voor de geselecteere objecten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid ""
 "<html>Select to show changesets for the currently selected objects only."
@@ -7515 +7698 @@
 "objecten in de huidige laag.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
 msgid "Changesets"
 msgstr "Wijzigingensets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:249
 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:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
@@ -7530 +7713 @@
 "wijzigingensets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
@@ -7536 +7719 @@
 msgstr "Downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:344
 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:383
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379
 msgid "Closes the selected open changesets"
 msgstr "Sluit de geselecteerde open wijzigingenset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:414
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410
+#: ../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:415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:411
 msgid "Open a web page for each selected changeset"
 msgstr "Open een webpagina voor iedere geselecteerde wijzigingenset"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:450
 #: build/specialmessages.java:49
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194
@@ -7561 +7744 @@
 msgstr "Details"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:451
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr ""
 "Opent het Wijzigingensetsbewerkvenster voor de geselecteerde wijzigingenset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:229
 msgid "Command Stack"
 msgstr "Opdrachtenlijst"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:73
+#: ../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)."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
+#: ../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/LayerListDialog.java:157
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
+#: ../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/UserListDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
@@ -7600 +7783 @@
 msgstr "Omschakelen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307
 msgid ""
 "Selects the objects that take part in this command (unless currently deleted)"
@@ -7607 +7790 @@
 "verwijderde objecten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:368
 msgid "Undo the selected and all later commands"
 msgstr "Maak de geselecteerde en alle latere opdrachten ongeda"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
 msgid "Redo the selected and all earlier commands"
 msgstr "Voer de geselecteerde en alle eerdere opdrachten opnieuw uit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:110
 msgid "Resolve conflicts."
 msgstr "Los conflicten op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:164
 #, java-format
 msgid "Conflicts: {0} unresolved"
 msgstr "Conflicten: {0} nog op te lossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336
 msgid "Resolve"
 msgstr "Oplossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -7634 +7817 @@
 "lijst openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
+#: ../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/ValidatorDialog.java:110
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
 msgid ""
@@ -7694 +7877 @@
 msgstr "Conflicten oplossen voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../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"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:83
+msgid "Enable filter"
+msgstr "Schakel filter in"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:84
+msgid "Hide elements"
+msgstr "Verberg elementen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
+msgid "Inverse filter"
+msgstr "Inverteer filter"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+msgid "Filter mode"
+msgstr "Filtermodus"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Add filter."
 msgstr "Voeg filter toe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 msgid "Edit filter."
 msgstr "Pas filter aan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:144
 msgid "Delete filter."
 msgstr "Verwijder filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:153
 msgid "Move filter up."
 msgstr "Zet filter hoger"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:163
 msgid "Move filter down."
 msgstr "Zet filter lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
-msgid "Enable filter"
-msgstr "Schakel filter in"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
-msgid "Hide elements"
-msgstr "Verberg elementen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
-msgid "Inverse filter"
-msgstr "Inverteer filter"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
-msgid "Filter mode"
-msgstr "Filtermodus"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:201
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -7817 +8000 @@
 msgstr "</p><p>Filterdialoog afsluiten om alle objecten te zien.<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../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:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67
 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:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245
 msgid "Object with history"
 msgstr "Object met historiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155
@@ -7839 +8022 @@
 msgstr "Herladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Alle geselecteerde objecten herladen en de lijst verversen."
 
 #. JButton
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:334
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:763
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:886
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:774
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:897
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:373
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:510
@@ -7854 +8037 @@
 msgstr "Weergeven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
 msgid "Display the history of the selected objects."
 msgstr "Historiek voor de geselecteerde objecten tonen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 msgid "Advanced object info"
 msgstr "Geavanceerde objectinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81
 msgid "map style"
 msgstr "kaartstijl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133
+#, fuzzy
+msgid "In conflict with:\n"
+msgstr "conflict"
+
+#: ../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:108
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:153
+msgstr "Node id={0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148
+#: ../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:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152
+#: ../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
-msgid " incomplete\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:117
 #, java-format
 msgid " lat={0} lon={1} (projected: x={2}, y={3}); "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:128
+#: ../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:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
 #, java-format
 msgid " {0} node; "
@@ -7900 +8088 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182
 msgid "  nodes:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:151
+#: ../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:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199
 #, java-format
 msgid " {0} member; "
@@ -7916 +8104 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:204
 msgid "  members:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:181
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:254
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:323
+#: ../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 "<nieuw object>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:212
 #, java-format
 msgid ""
@@ -7932 +8120 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221
 msgid "; deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224
 msgid "; deleted-on-server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227
 msgid "; modified"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230
 msgid "; filtered/hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233
 msgid "; filtered/disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:236
 msgid "; has direction keys"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:238
 msgid " (reversed)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:246
 msgid "  tags:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:258
 msgid "  way referrer:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:269
 msgid "  relation referrer:\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:260
+#: ../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:262
+#: ../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:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300
 #, java-format
 msgid " {0} name: {1}"
@@ -7989 +8177 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
 #, java-format
 msgid "Styles Cache for \"{0}\":"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327
 #, java-format
 msgid ""
@@ -8002 +8190 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:329
 #, java-format
 msgid ""
@@ -8009 +8197 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:334
 #, java-format
 msgid ""
@@ -8017 +8205 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337
 msgid ""
 "\n"
@@ -8024 +8212 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:350
 msgid "The 2 selected objects have identical style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:353
 msgid "The 2 selected objects have different style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:356
 msgid ""
 "Warning: The 2 selected objects have equal, but not identical style caches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:363
 msgid "xml"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:365
 msgid "mapcss"
 msgstr ""
@@ -8057 +8245 @@
 #. 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:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:366
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -8067 +8255 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440
-#: build/trans_presets.java:566 build/trans_presets.java:611
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:2228 build/trans_presets.java:2564
-#: build/trans_presets.java:2565 build/trans_presets.java:2566
+#: build/trans_presets.java:581 build/trans_presets.java:628
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412 build/trans_presets.java:1585
+#: build/trans_presets.java:1586 build/trans_presets.java:1587
+#: build/trans_presets.java:2362 build/trans_presets.java:2709
+#: build/trans_presets.java:2710 build/trans_presets.java:2711
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
@@ -8079 +8267 @@
 msgstr "onbekend"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:85
 msgid ""
 "Enter the coordinates for the new node.<br/>You can separate longitude and "
@@ -8101 +8289 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:130
+msgid "Projected coordinates:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:138
+msgid ""
+"Enter easting and northing (x and y) separated by space, comma or semicolon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:154
+msgid "Lat/Lon"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:155
+msgid "East/North"
+msgstr ""
+
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:267
-msgid "Close the dialog and create a new node"
-msgstr "Sluit het venster en maak een nieuwe knoop"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:280
-msgid "Close the dialog, do not create a new node"
-msgstr "Sluit het venster zonder een nieuwe knoop te maken"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174
+msgid "Please enter a Easting and Northing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:144
+#, java-format
+msgid "Toggle visibility of layer: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Layers"
 msgstr "Lagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:353
 msgid "Delete the selected layers."
 msgstr "Verwijder de geselecteerde lagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:401
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1461
 msgid "Show/Hide"
 msgstr "Tonen/Verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:447
 msgid "Toggle visible state of the selected layer."
 msgstr "Zichtbaarheid van een laag in- of uitschakelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:507
 msgid "Opacity"
 msgstr "Ondoorzichtigheid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:486
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:519
 msgid "Adjust opacity of the layer."
 msgstr "Ondoorzichtigheid van de laag aanpassen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:604
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
 msgid "Activate"
 msgstr "Activeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:610
 msgid "Activate the selected layer"
 msgstr "De geselecteerde laag activeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:646
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:679
 msgid "Merge this layer into another layer"
 msgstr "Deze laag samenvoegen met een andere laag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:713
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:746
 msgid "Duplicate this layer"
 msgstr "Deze laag dupliceren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
+#: ../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)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:789
+#: ../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)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:836
 msgid "this layer is the active layer"
 msgstr "dit is de actieve laag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:803
+#: ../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:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:952
 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:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:973
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
@@ -8202 +8409 @@
 msgstr "KaartTekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:308
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:297
 msgid "Turn selected styles on or off"
 msgstr "Zet geselecteerde stijlen aan/uit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:332
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row down."
 msgstr "Geselecteerde lijn één rij omlaag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:332
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row up."
 msgstr "Geselecteerde lijn één rij omhoog."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:376
 msgid "Reload from file"
 msgstr "Terugzetten uit bestand"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:377
 msgid "reload selected styles from file"
 msgstr "Geselecteerde stijlen terugzetten uit bestand"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:436
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:425
 msgid "Save as..."
 msgstr "Opslaan als.."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:437
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:426
 msgid "Save a copy of this Style to file and add it to the list"
 msgstr ""
 "Sla een kopie van deze stijl op in een bestand en voeg het toe aan de lijst"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:231
 msgid "Reloading style sources"
 msgstr "Terugzetten van stijlbronnen uit bestand"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:480
 #, java-format
 msgid "Save style ''{0}'' as ''{1}''"
 msgstr "Sla stijl ''{0}'' op als ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:524
 msgid "view meta information, error log and source definition"
 msgstr "Bekijk meta-informatie, foutenlogboek en brondefinitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
 msgid "Map Style info"
 msgstr "Kaartstijlinfo"
 
-#. <key key="power" value="generator" />
 #. item "Power/Power Generator" combo "Source"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:573
-#: build/trans_presets.java:3104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562
+#: build/trans_presets.java:3250
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
 msgstr "Bron"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:586
 msgid "Title:"
 msgstr "Titel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:588
 msgid "URL:"
 msgstr "URL-adres:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:590
 msgid "Built-in Style, internal path:"
 msgstr "Ingebouwde stijl, intern pad:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:592
 msgid "Path:"
 msgstr "Pad:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:595
 msgid "Icon:"
 msgstr "Icoon:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:598
 msgid "Background:"
 msgstr "Achtergrond:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 msgid "Style is currently active?"
 msgstr "Stijl is op dit moment actief?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -8295 +8501 @@
 
 #. 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:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:778
-#: build/trans_presets.java:4095
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774
+#: build/trans_presets.java:4258
 msgid "Relations"
 msgstr "Relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
 msgid "Open a list of all relations."
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:272
 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:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:313
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:351
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40
@@ -8321 +8527 @@
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:388
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19
@@ -8328 +8534 @@
 "Maak een kopie van de relatie aan en open ze in een ander bewerkvenster"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
 msgid "Add the selected relations to the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428
 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:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
 msgid "Select relation (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1222
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr "Selekteer relatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
 msgid "Add the members of all selected relations to current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467
 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:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
 msgid "Select members (add)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr "Selecteer de leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:504
 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:509
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505
 msgid "Download members"
 msgstr "Haal leden op vanaf de server"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274
+#: ../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
 msgid "Download incomplete members of selected relations"
 msgstr ""
@@ -8380 +8586 @@
 "server"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1276
+#: ../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
 msgid "Download incomplete members"
 msgstr "Haal onvolledig afgehaalde leden op vanaf de server"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:776
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128
 msgid "Current Selection"
 msgstr "Huidige selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:164
+#: ../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:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:255
 msgid "Search for objects"
 msgstr "Zoeken naar objecten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:355
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:356
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:389
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:390
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:421
+#: ../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:422
+#: ../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:449
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1228
+#: ../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 "Selecteer in relatielijst"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1229
+#: ../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 "Selecteer relatie in relatielijst"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:500
+#: ../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
@@ -8442 +8648 @@
 msgstr "Selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:465
 #, 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:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:783
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:901
+#: ../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:902
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856
 msgid "Inspect"
 msgstr "Inspecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:430
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -8472 +8678 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:435
+#: ../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"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:154
 msgid "Authors"
 msgstr "Auteurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:152
 #, java-format
 msgid "{0} Author"
@@ -8494 +8700 @@
 msgstr[1] "{0} Auteurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
 msgid "Select objects submitted by this user"
 msgstr "Door deze gebruiker aangeleverde objecten selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:204
 msgid "Launches a browser with information about the user"
 msgstr "Toont informatie over deze gebruiker in een browservenster"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
 #, java-format
 msgid ""
@@ -8510 +8716 @@
 "gebruikers een infovenster geopend"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:239
 #, java-format
 msgid ""
@@ -8519 +8725 @@
 "''{0}''<br>niet voorhanden is op dit systeem.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:241
 msgid "Missing encoding"
 msgstr "encodering niet voorhanden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:264
 msgid "Load CT"
 msgstr "CT (bijdragevoorwaarden) laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:265
 msgid ""
 "Loads information about relicensing status from the server. Users having "
@@ -8536 +8742 @@
 "vinkje naast hun gebruikersnaam."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "Author"
 msgstr "Auteur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "# Objects"
 msgstr "# Objecten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:335
 msgid "CT"
 msgstr "CT (bijdragevoorwaarden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90
 msgid "Validation results"
 msgstr "Validatieresultaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89
 msgid "Open the validation window."
 msgstr "Het validatiescherm openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:83
 msgid "Zoom to problem"
 msgstr "Op probleem inzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:116
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43
 msgid "Fix"
 msgstr "Herstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:116
 msgid "Fix the selected issue."
 msgstr "Repareer het geselecteerde probleem"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:122
 msgid "Ignore the selected issue next time."
 msgstr "Negeer het geselecteerde probleem in het vervolg."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:226
 msgid "Whole group"
 msgstr "Gehele groep"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:226
 msgid "Single elements"
 msgstr "Individuele elementen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:226
 msgid "Nothing"
 msgstr "Niets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:227
 msgid "Ignore whole group or individual elements?"
 msgstr "Gehele groep of individuele elementen negeren?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
 msgid "Ignoring elements"
 msgstr "Elementen negeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:522
 msgid "Fixing errors ..."
 msgstr "Herstellen van fouten ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:552
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:545
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
 msgstr "({0}/{1}): ''{2}'' worden hersteld"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:560
 msgid "Updating map ..."
 msgstr "Kaart wordt bijgewerkt ..."
@@ -9061 +9267 @@
 #. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Gondola" text "Name"
+#. <key key="aerialway" value="mixed_lift" />
+#. item "Aerialway/Mixed Lift" text "Name"
+#. <key key="aerialway" value="t-bar" />
+#. item "Aerialway/T-bar Lift" text "Name"
+#. <key key="aerialway" value="j-bar" />
+#. item "Aerialway/J-bar Lift" text "Name"
+#. <key key="aerialway" value="platter" />
+#. item "Aerialway/Platter Lift" text "Name"
+#. <key key="aerialway" value="rope_tow" />
+#. item "Aerialway/Rope Tow" text "Name"
+#. <key key="aerialway" value="magic_carpet" />
+#. item "Aerialway/Magic Carpet" text "Name"
+#. <key key="aerialway" value="goods" />
+#. item "Aerialway/Goods" text "Name"
 #. <key key="aerialway" value="station" />
 #. item "Aerialway/Station" text "Name"
 #. <key key="aerialway" value="pylon" />
 #. item "Aerialway/Pylon" text "Name"
-#. <key key="aerialway" value="goods" />
-#. item "Aerialway/Goods" text "Name"
 #. <key key="amenity" value="parking" />
 #. item "Car/Parking" text "Name"
@@ -9256 +9474 @@
 #. <key key="amenity" value="driving_school" />
 #. item "Education/Driving School" text "Name"
+#. <key key="amenity" value="hospital" />
+#. item "Health/Hospital" text "Name"
 #. <key key="amenity" value="doctors" />
 #. item "Health/Doctors" text "Name"
 #. <key key="amenity" value="dentist" />
 #. item "Health/Dentist" text "Name"
+#. <key key="amenity" value="nursing_home" />
+#. item "Health/Nursing Home" text "Name"
 #. item "Health/Pharmacy" text "Name"
 #. <space />
 #. <key key="shop" value="hearing_aids" />
 #. item "Health/Hearing Aids" text "Name"
-#. <key key="amenity" value="hospital" />
-#. item "Health/Hospital" text "Name"
 #. <key key="amenity" value="veterinary" />
 #. item "Health/Veterinary" text "Name"
@@ -9418 +9638 @@
 #. <key key="man_made" value="surveillance" />
 #. item "Man Made/Man Made/Surveillance" text "Name"
+#. <key key="power" value="generator" />
 #. item "Power/Power Generator" text "Name"
 #. <key key="power" value="station" />
@@ -9612 +9833 @@
 #. item "Places/Hamlet" text "Name"
 #. <space />
+#. <key key="place" value="isolated_dwelling" />
+#. item "Places/Isolated Dwelling" text "Name"
+#. <space />
 #. <key key="place" value="locality" />
 #. item "Places/Locality" text "Name"
@@ -9727 +9951 @@
 #. item "Relations/Turn restriction" text "Name"
 #. item "Relations/Route" text "Name"
+#. item "Relations/Directional Route (North America)" text "Name"
 #. <key key="type" value="network" />
 #. item "Relations/Route network" text "Name"
@@ -9732 +9957 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../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
 #: build/specialmessages.java:70 build/trans_presets.java:116
 #: build/trans_presets.java:154 build/trans_presets.java:196
-#: build/trans_presets.java:236 build/trans_presets.java:257
-#: build/trans_presets.java:277 build/trans_presets.java:297
-#: build/trans_presets.java:318 build/trans_presets.java:337
-#: build/trans_presets.java:358 build/trans_presets.java:393
-#: build/trans_presets.java:413 build/trans_presets.java:471
-#: build/trans_presets.java:491 build/trans_presets.java:506
-#: build/trans_presets.java:521 build/trans_presets.java:546
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:627 build/trans_presets.java:650
-#: build/trans_presets.java:670 build/trans_presets.java:690
-#: build/trans_presets.java:710 build/trans_presets.java:720
-#: build/trans_presets.java:731 build/trans_presets.java:793
-#: build/trans_presets.java:817 build/trans_presets.java:826
-#: build/trans_presets.java:887 build/trans_presets.java:1040
-#: build/trans_presets.java:1048 build/trans_presets.java:1056
-#: build/trans_presets.java:1064 build/trans_presets.java:1075
-#: build/trans_presets.java:1084 build/trans_presets.java:1090
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1119 build/trans_presets.java:1126
+#: build/trans_presets.java:238 build/trans_presets.java:260
+#: build/trans_presets.java:281 build/trans_presets.java:302
+#: build/trans_presets.java:324 build/trans_presets.java:344
+#: build/trans_presets.java:366 build/trans_presets.java:402
+#: 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:620
+#: build/trans_presets.java:645 build/trans_presets.java:669
+#: build/trans_presets.java:690 build/trans_presets.java:711
+#: build/trans_presets.java:731 build/trans_presets.java:741
+#: build/trans_presets.java:752 build/trans_presets.java:814
+#: build/trans_presets.java:832 build/trans_presets.java:841
+#: build/trans_presets.java:914 build/trans_presets.java:1073
+#: build/trans_presets.java:1081 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1108
+#: build/trans_presets.java:1117 build/trans_presets.java:1123
 #: build/trans_presets.java:1131 build/trans_presets.java:1138
-#: build/trans_presets.java:1143 build/trans_presets.java:1149
-#: build/trans_presets.java:1156 build/trans_presets.java:1166
-#: build/trans_presets.java:1172 build/trans_presets.java:1178
-#: build/trans_presets.java:1183 build/trans_presets.java:1189
-#: build/trans_presets.java:1197 build/trans_presets.java:1206
-#: build/trans_presets.java:1213 build/trans_presets.java:1219
-#: build/trans_presets.java:1236 build/trans_presets.java:1243
-#: build/trans_presets.java:1250 build/trans_presets.java:1347
-#: build/trans_presets.java:1398 build/trans_presets.java:1404
-#: build/trans_presets.java:1410 build/trans_presets.java:1416
-#: build/trans_presets.java:1423 build/trans_presets.java:1429
-#: build/trans_presets.java:1434 build/trans_presets.java:1444
-#: build/trans_presets.java:1465 build/trans_presets.java:1497
-#: build/trans_presets.java:1507 build/trans_presets.java:1513
-#: build/trans_presets.java:1521 build/trans_presets.java:1537
-#: build/trans_presets.java:1546 build/trans_presets.java:1556
-#: build/trans_presets.java:1565 build/trans_presets.java:1589
-#: build/trans_presets.java:1597 build/trans_presets.java:1611
-#: build/trans_presets.java:1622 build/trans_presets.java:1632
-#: build/trans_presets.java:1642 build/trans_presets.java:1662
-#: build/trans_presets.java:1674 build/trans_presets.java:1685
-#: build/trans_presets.java:1705 build/trans_presets.java:1720
-#: build/trans_presets.java:1728 build/trans_presets.java:1785
-#: build/trans_presets.java:1802 build/trans_presets.java:1820
-#: build/trans_presets.java:1837 build/trans_presets.java:1854
-#: build/trans_presets.java:1871 build/trans_presets.java:1888
-#: build/trans_presets.java:1906 build/trans_presets.java:1928
-#: build/trans_presets.java:1947 build/trans_presets.java:1968
-#: build/trans_presets.java:1987 build/trans_presets.java:2004
-#: build/trans_presets.java:2023 build/trans_presets.java:2041
-#: build/trans_presets.java:2058 build/trans_presets.java:2075
-#: build/trans_presets.java:2091 build/trans_presets.java:2098
-#: build/trans_presets.java:2106 build/trans_presets.java:2113
-#: build/trans_presets.java:2130 build/trans_presets.java:2138
-#: build/trans_presets.java:2153 build/trans_presets.java:2163
-#: build/trans_presets.java:2175 build/trans_presets.java:2185
-#: build/trans_presets.java:2192 build/trans_presets.java:2201
-#: build/trans_presets.java:2210 build/trans_presets.java:2216
-#: build/trans_presets.java:2225 build/trans_presets.java:2235
-#: build/trans_presets.java:2240 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2263
-#: build/trans_presets.java:2272 build/trans_presets.java:2279
-#: build/trans_presets.java:2286 build/trans_presets.java:2292
-#: build/trans_presets.java:2300 build/trans_presets.java:2310
-#: build/trans_presets.java:2322 build/trans_presets.java:2328
-#: build/trans_presets.java:2335 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2357
-#: build/trans_presets.java:2365 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2386
-#: build/trans_presets.java:2392 build/trans_presets.java:2398
-#: build/trans_presets.java:2404 build/trans_presets.java:2411
-#: build/trans_presets.java:2421 build/trans_presets.java:2427
-#: build/trans_presets.java:2435 build/trans_presets.java:2443
-#: build/trans_presets.java:2451 build/trans_presets.java:2478
-#: build/trans_presets.java:2556 build/trans_presets.java:2574
-#: build/trans_presets.java:2584 build/trans_presets.java:2599
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2626 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2649
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2673
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2709
-#: build/trans_presets.java:2715 build/trans_presets.java:2721
-#: build/trans_presets.java:2727 build/trans_presets.java:2734
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2757 build/trans_presets.java:2763
-#: build/trans_presets.java:2769 build/trans_presets.java:2775
-#: build/trans_presets.java:2781 build/trans_presets.java:2787
-#: build/trans_presets.java:2793 build/trans_presets.java:2799
-#: build/trans_presets.java:2807 build/trans_presets.java:2816
-#: build/trans_presets.java:2823 build/trans_presets.java:2829
-#: build/trans_presets.java:2835 build/trans_presets.java:2841
-#: build/trans_presets.java:2847 build/trans_presets.java:2853
-#: build/trans_presets.java:2859 build/trans_presets.java:2865
-#: build/trans_presets.java:2871 build/trans_presets.java:2877
-#: build/trans_presets.java:2883 build/trans_presets.java:2891
-#: build/trans_presets.java:2897 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2935
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
-#: build/trans_presets.java:2965 build/trans_presets.java:2970
-#: build/trans_presets.java:2985 build/trans_presets.java:2992
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3021 build/trans_presets.java:3030
-#: build/trans_presets.java:3037 build/trans_presets.java:3044
-#: build/trans_presets.java:3050 build/trans_presets.java:3057
-#: build/trans_presets.java:3063 build/trans_presets.java:3077
-#: build/trans_presets.java:3087 build/trans_presets.java:3093
-#: build/trans_presets.java:3106 build/trans_presets.java:3113
-#: build/trans_presets.java:3169 build/trans_presets.java:3175
-#: build/trans_presets.java:3183 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3208 build/trans_presets.java:3213
-#: build/trans_presets.java:3218 build/trans_presets.java:3223
-#: build/trans_presets.java:3232 build/trans_presets.java:3239
-#: build/trans_presets.java:3246 build/trans_presets.java:3254
-#: build/trans_presets.java:3261 build/trans_presets.java:3269
-#: build/trans_presets.java:3278 build/trans_presets.java:3286
-#: build/trans_presets.java:3295 build/trans_presets.java:3304
-#: build/trans_presets.java:3311 build/trans_presets.java:3319
-#: build/trans_presets.java:3325 build/trans_presets.java:3333
-#: build/trans_presets.java:3341 build/trans_presets.java:3348
-#: build/trans_presets.java:3355 build/trans_presets.java:3361
-#: build/trans_presets.java:3369 build/trans_presets.java:3376
-#: build/trans_presets.java:3382 build/trans_presets.java:3390
-#: build/trans_presets.java:3399 build/trans_presets.java:3405
-#: build/trans_presets.java:3413 build/trans_presets.java:3422
-#: build/trans_presets.java:3429 build/trans_presets.java:3435
-#: build/trans_presets.java:3444 build/trans_presets.java:3453
-#: build/trans_presets.java:3469 build/trans_presets.java:3478
-#: build/trans_presets.java:3486 build/trans_presets.java:3492
-#: build/trans_presets.java:3498 build/trans_presets.java:3506
-#: build/trans_presets.java:3515 build/trans_presets.java:3524
-#: build/trans_presets.java:3531 build/trans_presets.java:3539
-#: build/trans_presets.java:3546 build/trans_presets.java:3554
-#: build/trans_presets.java:3562 build/trans_presets.java:3570
-#: build/trans_presets.java:3579 build/trans_presets.java:3588
-#: build/trans_presets.java:3596 build/trans_presets.java:3604
-#: build/trans_presets.java:3611 build/trans_presets.java:3618
-#: build/trans_presets.java:3626 build/trans_presets.java:3633
-#: build/trans_presets.java:3641 build/trans_presets.java:3668
-#: build/trans_presets.java:3674 build/trans_presets.java:3680
-#: build/trans_presets.java:3686 build/trans_presets.java:3692
-#: build/trans_presets.java:3700 build/trans_presets.java:3707
-#: build/trans_presets.java:3714 build/trans_presets.java:3721
-#: build/trans_presets.java:3728 build/trans_presets.java:3736
+#: build/trans_presets.java:1152 build/trans_presets.java:1159
+#: build/trans_presets.java:1164 build/trans_presets.java:1171
+#: build/trans_presets.java:1176 build/trans_presets.java:1182
+#: build/trans_presets.java:1189 build/trans_presets.java:1199
+#: build/trans_presets.java:1205 build/trans_presets.java:1211
+#: build/trans_presets.java:1216 build/trans_presets.java:1222
+#: build/trans_presets.java:1230 build/trans_presets.java:1239
+#: build/trans_presets.java:1246 build/trans_presets.java:1252
+#: build/trans_presets.java:1269 build/trans_presets.java:1276
+#: build/trans_presets.java:1283 build/trans_presets.java:1380
+#: build/trans_presets.java:1432 build/trans_presets.java:1446
+#: build/trans_presets.java:1457 build/trans_presets.java:1470
+#: build/trans_presets.java:1483 build/trans_presets.java:1497
+#: build/trans_presets.java:1508 build/trans_presets.java:1519
+#: build/trans_presets.java:1530 build/trans_presets.java:1541
+#: build/trans_presets.java:1551 build/trans_presets.java:1562
+#: build/trans_presets.java:1568 build/trans_presets.java:1578
+#: build/trans_presets.java:1599 build/trans_presets.java:1631
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1655 build/trans_presets.java:1671
+#: build/trans_presets.java:1680 build/trans_presets.java:1690
+#: build/trans_presets.java:1699 build/trans_presets.java:1723
+#: build/trans_presets.java:1731 build/trans_presets.java:1745
+#: build/trans_presets.java:1756 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:1796
+#: build/trans_presets.java:1808 build/trans_presets.java:1819
+#: build/trans_presets.java:1839 build/trans_presets.java:1854
+#: build/trans_presets.java:1862 build/trans_presets.java:1919
+#: build/trans_presets.java:1936 build/trans_presets.java:1954
+#: build/trans_presets.java:1971 build/trans_presets.java:1988
+#: build/trans_presets.java:2005 build/trans_presets.java:2022
+#: build/trans_presets.java:2040 build/trans_presets.java:2062
+#: build/trans_presets.java:2081 build/trans_presets.java:2102
+#: build/trans_presets.java:2121 build/trans_presets.java:2138
+#: build/trans_presets.java:2157 build/trans_presets.java:2175
+#: build/trans_presets.java:2192 build/trans_presets.java:2209
+#: build/trans_presets.java:2225 build/trans_presets.java:2232
+#: build/trans_presets.java:2240 build/trans_presets.java:2247
+#: build/trans_presets.java:2264 build/trans_presets.java:2272
+#: build/trans_presets.java:2287 build/trans_presets.java:2297
+#: build/trans_presets.java:2309 build/trans_presets.java:2319
+#: build/trans_presets.java:2326 build/trans_presets.java:2335
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2359 build/trans_presets.java:2369
+#: build/trans_presets.java:2374 build/trans_presets.java:2382
+#: build/trans_presets.java:2389 build/trans_presets.java:2397
+#: build/trans_presets.java:2406 build/trans_presets.java:2413
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2434 build/trans_presets.java:2445
+#: build/trans_presets.java:2457 build/trans_presets.java:2463
+#: build/trans_presets.java:2470 build/trans_presets.java:2478
+#: build/trans_presets.java:2485 build/trans_presets.java:2492
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2513 build/trans_presets.java:2521
+#: build/trans_presets.java:2527 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2546
+#: build/trans_presets.java:2556 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2583 build/trans_presets.java:2591
+#: build/trans_presets.java:2623 build/trans_presets.java:2701
+#: build/trans_presets.java:2719 build/trans_presets.java:2729
+#: build/trans_presets.java:2744 build/trans_presets.java:2753
+#: build/trans_presets.java:2762 build/trans_presets.java:2771
+#: build/trans_presets.java:2780 build/trans_presets.java:2786
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:2806 build/trans_presets.java:2812
+#: build/trans_presets.java:2818 build/trans_presets.java:2824
+#: build/trans_presets.java:2830 build/trans_presets.java:2836
+#: build/trans_presets.java:2842 build/trans_presets.java:2848
+#: build/trans_presets.java:2854 build/trans_presets.java:2860
+#: build/trans_presets.java:2866 build/trans_presets.java:2872
+#: build/trans_presets.java:2879 build/trans_presets.java:2888
+#: build/trans_presets.java:2896 build/trans_presets.java:2902
+#: build/trans_presets.java:2908 build/trans_presets.java:2914
+#: build/trans_presets.java:2920 build/trans_presets.java:2926
+#: build/trans_presets.java:2932 build/trans_presets.java:2938
+#: build/trans_presets.java:2944 build/trans_presets.java:2952
+#: build/trans_presets.java:2961 build/trans_presets.java:2968
+#: build/trans_presets.java:2974 build/trans_presets.java:2980
+#: build/trans_presets.java:2986 build/trans_presets.java:2992
+#: build/trans_presets.java:2998 build/trans_presets.java:3004
+#: build/trans_presets.java:3010 build/trans_presets.java:3016
+#: build/trans_presets.java:3022 build/trans_presets.java:3028
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3054
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3080 build/trans_presets.java:3095
+#: build/trans_presets.java:3102 build/trans_presets.java:3110
+#: build/trans_presets.java:3115 build/trans_presets.java:3130
+#: build/trans_presets.java:3137 build/trans_presets.java:3149
+#: build/trans_presets.java:3159 build/trans_presets.java:3166
+#: build/trans_presets.java:3175 build/trans_presets.java:3182
+#: build/trans_presets.java:3189 build/trans_presets.java:3195
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3222 build/trans_presets.java:3232
+#: build/trans_presets.java:3238 build/trans_presets.java:3249
+#: build/trans_presets.java:3269 build/trans_presets.java:3325
+#: build/trans_presets.java:3331 build/trans_presets.java:3339
+#: build/trans_presets.java:3346 build/trans_presets.java:3352
+#: build/trans_presets.java:3358 build/trans_presets.java:3364
+#: build/trans_presets.java:3369 build/trans_presets.java:3374
+#: build/trans_presets.java:3379 build/trans_presets.java:3388
+#: build/trans_presets.java:3395 build/trans_presets.java:3402
+#: build/trans_presets.java:3410 build/trans_presets.java:3417
+#: build/trans_presets.java:3425 build/trans_presets.java:3434
+#: build/trans_presets.java:3442 build/trans_presets.java:3451
+#: build/trans_presets.java:3460 build/trans_presets.java:3467
+#: build/trans_presets.java:3475 build/trans_presets.java:3481
+#: build/trans_presets.java:3489 build/trans_presets.java:3497
+#: build/trans_presets.java:3504 build/trans_presets.java:3511
+#: build/trans_presets.java:3517 build/trans_presets.java:3525
+#: build/trans_presets.java:3532 build/trans_presets.java:3538
+#: build/trans_presets.java:3546 build/trans_presets.java:3555
+#: build/trans_presets.java:3561 build/trans_presets.java:3569
+#: build/trans_presets.java:3578 build/trans_presets.java:3585
+#: build/trans_presets.java:3591 build/trans_presets.java:3600
+#: build/trans_presets.java:3609 build/trans_presets.java:3625
+#: build/trans_presets.java:3634 build/trans_presets.java:3642
+#: build/trans_presets.java:3648 build/trans_presets.java:3654
+#: build/trans_presets.java:3662 build/trans_presets.java:3671
+#: build/trans_presets.java:3680 build/trans_presets.java:3687
+#: build/trans_presets.java:3695 build/trans_presets.java:3702
+#: build/trans_presets.java:3710 build/trans_presets.java:3718
+#: build/trans_presets.java:3726 build/trans_presets.java:3735
 #: build/trans_presets.java:3744 build/trans_presets.java:3752
-#: build/trans_presets.java:3759 build/trans_presets.java:3766
-#: build/trans_presets.java:3775 build/trans_presets.java:3784
-#: build/trans_presets.java:3792 build/trans_presets.java:3800
-#: build/trans_presets.java:3808 build/trans_presets.java:3817
-#: build/trans_presets.java:3825 build/trans_presets.java:3835
-#: build/trans_presets.java:3845 build/trans_presets.java:3854
-#: build/trans_presets.java:3860 build/trans_presets.java:3866
-#: build/trans_presets.java:3872 build/trans_presets.java:3877
-#: build/trans_presets.java:3883 build/trans_presets.java:3893
-#: build/trans_presets.java:3899 build/trans_presets.java:3905
-#: build/trans_presets.java:3911 build/trans_presets.java:3918
-#: build/trans_presets.java:3925 build/trans_presets.java:3931
-#: build/trans_presets.java:3937 build/trans_presets.java:3944
-#: build/trans_presets.java:3950 build/trans_presets.java:3955
-#: build/trans_presets.java:3962 build/trans_presets.java:3969
-#: build/trans_presets.java:3975 build/trans_presets.java:3984
-#: build/trans_presets.java:3992 build/trans_presets.java:3998
-#: build/trans_presets.java:4004 build/trans_presets.java:4011
-#: build/trans_presets.java:4019 build/trans_presets.java:4025
-#: build/trans_presets.java:4032 build/trans_presets.java:4038
-#: build/trans_presets.java:4044 build/trans_presets.java:4050
-#: build/trans_presets.java:4056 build/trans_presets.java:4103
-#: build/trans_presets.java:4117 build/trans_presets.java:4136
-#: build/trans_presets.java:4150 build/trans_presets.java:4173
+#: build/trans_presets.java:3760 build/trans_presets.java:3767
+#: build/trans_presets.java:3774 build/trans_presets.java:3782
+#: build/trans_presets.java:3789 build/trans_presets.java:3797
+#: build/trans_presets.java:3824 build/trans_presets.java:3830
+#: build/trans_presets.java:3836 build/trans_presets.java:3842
+#: build/trans_presets.java:3848 build/trans_presets.java:3856
+#: build/trans_presets.java:3863 build/trans_presets.java:3870
+#: build/trans_presets.java:3877 build/trans_presets.java:3884
+#: build/trans_presets.java:3892 build/trans_presets.java:3900
+#: build/trans_presets.java:3908 build/trans_presets.java:3915
+#: build/trans_presets.java:3922 build/trans_presets.java:3929
+#: build/trans_presets.java:3938 build/trans_presets.java:3947
+#: build/trans_presets.java:3955 build/trans_presets.java:3963
+#: build/trans_presets.java:3971 build/trans_presets.java:3980
+#: build/trans_presets.java:3988 build/trans_presets.java:3998
+#: build/trans_presets.java:4008 build/trans_presets.java:4017
+#: build/trans_presets.java:4023 build/trans_presets.java:4029
+#: build/trans_presets.java:4035 build/trans_presets.java:4040
+#: build/trans_presets.java:4046 build/trans_presets.java:4056
+#: build/trans_presets.java:4062 build/trans_presets.java:4068
+#: build/trans_presets.java:4074 build/trans_presets.java:4081
+#: build/trans_presets.java:4088 build/trans_presets.java:4094
+#: build/trans_presets.java:4100 build/trans_presets.java:4107
+#: build/trans_presets.java:4113 build/trans_presets.java:4118
+#: build/trans_presets.java:4125 build/trans_presets.java:4132
+#: build/trans_presets.java:4138 build/trans_presets.java:4147
+#: build/trans_presets.java:4155 build/trans_presets.java:4161
+#: build/trans_presets.java:4167 build/trans_presets.java:4174
+#: build/trans_presets.java:4182 build/trans_presets.java:4188
+#: build/trans_presets.java:4195 build/trans_presets.java:4201
+#: build/trans_presets.java:4207 build/trans_presets.java:4213
+#: build/trans_presets.java:4219 build/trans_presets.java:4266
+#: build/trans_presets.java:4280 build/trans_presets.java:4299
+#: build/trans_presets.java:4318 build/trans_presets.java:4348
+#: build/trans_presets.java:4373
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -10407 +10638 @@
 #: ../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:634
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:708
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
+#: ../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
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:309
@@ -10471 +10702 @@
 msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:600
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601
 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:649
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -10488 +10719 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:649
-#: build/trans_presets.java:2588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651
+#: build/trans_presets.java:2733
 msgid "Position"
 msgstr "Positie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:965
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:968
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1021
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 #, 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:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1046
 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:1050
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1081
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1079
 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:1093
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1091
 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:1124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1122
 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:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1123
 #: ../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:1225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1223
 #: ../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:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1251
 msgid "Select the members of selected relation"
 msgstr ""
@@ -10777 +11008 @@
 #. JButton
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:817
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:940
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:828
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:951
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:441
 msgid "Sort"
@@ -11309 +11540 @@
 #. item "Nature/Forest" combo "Type"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
-#: build/specialmessages.java:84 build/trans_presets.java:469
-#: build/trans_presets.java:766 build/trans_presets.java:775
-#: build/trans_presets.java:1167 build/trans_presets.java:1446
-#: build/trans_presets.java:1558 build/trans_presets.java:2312
-#: build/trans_presets.java:2537 build/trans_presets.java:2581
-#: build/trans_presets.java:2809 build/trans_presets.java:2818
-#: build/trans_presets.java:2978 build/trans_presets.java:3094
-#: build/trans_presets.java:3836 build/trans_presets.java:3846
-#: build/trans_presets.java:3855
+#: build/specialmessages.java:84 build/trans_presets.java:480
+#: build/trans_presets.java:787 build/trans_presets.java:796
+#: build/trans_presets.java:1200 build/trans_presets.java:1580
+#: build/trans_presets.java:1692 build/trans_presets.java:2447
+#: build/trans_presets.java:2682 build/trans_presets.java:2726
+#: build/trans_presets.java:2954 build/trans_presets.java:2963
+#: build/trans_presets.java:3123 build/trans_presets.java:3239
+#: build/trans_presets.java:3999 build/trans_presets.java:4009
+#: build/trans_presets.java:4018
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98
@@ -11324 +11555 @@
 msgstr "Soort"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:38
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:43
 msgid "Slippy map"
 msgstr "Slippy-kaart"
@@ -11475 +11706 @@
 msgstr "Historiek opnieuw laden van de server"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
@@ -11481 +11712 @@
 "worden ingesteld."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -11490 +11721 @@
 "overeen met historiek-ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282
 #, java-format
 msgid ""
@@ -11498 +11729 @@
 "beschikbaar in de geschiedenis."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:300
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
@@ -11504 +11735 @@
 "is mislukt."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:305
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312
 #, java-format
 msgid ""
@@ -12188 +12419 @@
 #: build/trans_presets.java:117 build/trans_presets.java:135
 #: build/trans_presets.java:155 build/trans_presets.java:175
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:237 build/trans_presets.java:258
-#: build/trans_presets.java:285 build/trans_presets.java:305
-#: build/trans_presets.java:326 build/trans_presets.java:345
-#: build/trans_presets.java:366 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:477
-#: build/trans_presets.java:492 build/trans_presets.java:507
-#: build/trans_presets.java:531 build/trans_presets.java:570
-#: build/trans_presets.java:590 build/trans_presets.java:612
-#: build/trans_presets.java:635 build/trans_presets.java:659
-#: build/trans_presets.java:678 build/trans_presets.java:698
-#: build/trans_presets.java:1041 build/trans_presets.java:1049
-#: build/trans_presets.java:1057 build/trans_presets.java:1065
-#: build/trans_presets.java:1076 build/trans_presets.java:1353
+#: build/trans_presets.java:197 build/trans_presets.java:216
+#: build/trans_presets.java:239 build/trans_presets.java:261
+#: build/trans_presets.java:289 build/trans_presets.java:310
+#: build/trans_presets.java:332 build/trans_presets.java:352
+#: build/trans_presets.java:374 build/trans_presets.java:409
+#: 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:629
+#: build/trans_presets.java:653 build/trans_presets.java:678
+#: build/trans_presets.java:698 build/trans_presets.java:719
+#: build/trans_presets.java:1074 build/trans_presets.java:1082
+#: build/trans_presets.java:1090 build/trans_presets.java:1098
+#: build/trans_presets.java:1109 build/trans_presets.java:1386
 msgid "Layer"
 msgstr "laag"
@@ -12652 +12883 @@
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:310
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:149
@@ -12661 +12892 @@
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:153
@@ -12670 +12901 @@
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #, java-format
@@ -12679 +12910 @@
 
 #. item "Relations/Route" text "Description"
+#. item "Relations/Directional Route (North America)" text "Description"
 #. description
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
-#: build/trans_presets.java:4153
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: build/trans_presets.java:4321 build/trans_presets.java:4351
 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
@@ -12690 +12923 @@
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:160
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:161
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:321
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:222
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:291
@@ -12708 +12943 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:318
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:224
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:288
@@ -12718 +12953 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:210
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:319
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:225
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:289
@@ -12728 +12963 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:251
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:267
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:239
 msgid "gps point"
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:317
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:287
 #, java-format
@@ -12742 +12977 @@
 msgstr[1] "{0} tracks, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:653
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:784
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -12756 +12991 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:663
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:548
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
@@ -12770 +13005 @@
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+msgid "Choose visible tracks"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:986
+msgid ""
+"<html>Select all tracks that you want to be displayed. You can drag select a "
+"range of tracks or use CTRL+Click to select specific ones. The map is "
+"updated live in the background. Open the URLs by double clicking them.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1004
+#, java-format
+msgid "Set track visibility for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
+msgid "Show all"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1005
+msgid "Show selected only"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1052
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1276
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -12781 +13040 @@
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:840
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1062
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:716
@@ -12787 +13046 @@
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:719
@@ -12794 +13053 @@
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1071
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:725
@@ -12800 +13059 @@
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:728
@@ -12807 +13066 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1080
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:734
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1081
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:735
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1158
+msgid "Calculating Download Area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1262
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:861
@@ -12838 +13101 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1100
+#: ../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."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1536
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1127
 msgid ""
@@ -12852 +13115 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1543
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1134
 msgid ""
@@ -12861 +13124 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1394
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1431
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1448
+#: ../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"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1464
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1747
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1346
 #, java-format
@@ -12877 +13140 @@
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1476
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1759
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1358
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1481
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1764
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1363
 #, java-format
@@ -12891 +13154 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1488
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1578
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1861
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1370
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1458
@@ -12898 +13161 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1512
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1795
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1393
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1547
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1830
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1427
 #, java-format
@@ -12909 +13172 @@
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1849
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1446
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1571
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1854
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1451
 #, java-format
@@ -13017 +13280 @@
 msgstr "Vond volgende problemen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331
 #, java-format
 msgid ""
@@ -13025 +13288 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:346
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:350
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:361
 msgid "Auto load tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:372
 msgid "Show Errors"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:388
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:392
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:411
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:415
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424
 msgid "Load All Error Tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:434
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:439
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:450
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:454
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:465
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1281
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1310
 msgid "zoom in to load any tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1283
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1312
 msgid "zoom in to load more tiles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1314
 msgid "increase zoom level to see more detail"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1318
 msgid "No tiles at this zoom level"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1372
+#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1401
 msgid "EPSG:4326 and Mercator projection are supported"
 msgstr ""
@@ -14848 +15111 @@
 #. group "Car"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1572
 msgid "Car"
 msgstr "Auto"
@@ -14855 +15118 @@
 #. item "Ways/Path" combo "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Cycle Barrier" check "Bicycle"
+#. item "Barriers/Block" check "Bicycle"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
@@ -14870 +15135 @@
 #. item "Public Transport/Subway Entrance" check "Bicycle"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:441 build/trans_presets.java:564
-#: build/trans_presets.java:843 build/trans_presets.java:862
-#: build/trans_presets.java:876 build/trans_presets.java:898
-#: build/trans_presets.java:935 build/trans_presets.java:948
-#: build/trans_presets.java:960 build/trans_presets.java:972
-#: build/trans_presets.java:984 build/trans_presets.java:996
-#: build/trans_presets.java:1006 build/trans_presets.java:1015
-#: build/trans_presets.java:1024 build/trans_presets.java:1584
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:452 build/trans_presets.java:579
+#: build/trans_presets.java:858 build/trans_presets.java:868
+#: build/trans_presets.java:877 build/trans_presets.java:889
+#: build/trans_presets.java:903 build/trans_presets.java:925
+#: build/trans_presets.java:968 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1017 build/trans_presets.java:1029
+#: build/trans_presets.java:1039 build/trans_presets.java:1048
+#: build/trans_presets.java:1057 build/trans_presets.java:1718
+#: build/trans_presets.java:1798
 msgid "Bicycle"
 msgstr "Fiets"
@@ -14886 +15152 @@
 #. <space />
 #. item "Barriers/Bollard" check "Foot"
+#. <space />
+#. item "Barriers/Cycle Barrier" check "Foot"
+#. <space />
+#. item "Barriers/Block" check "Foot"
 #. <space />
 #. item "Barriers/Cattle Grid" check "Foot"
@@ -14911 +15181 @@
 #. item "Barriers/Sally Port" check "Foot"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57
-#: build/trans_presets.java:437 build/trans_presets.java:563
-#: build/trans_presets.java:842 build/trans_presets.java:861
-#: build/trans_presets.java:875 build/trans_presets.java:897
-#: build/trans_presets.java:934 build/trans_presets.java:947
-#: build/trans_presets.java:959 build/trans_presets.java:971
-#: build/trans_presets.java:983 build/trans_presets.java:995
-#: build/trans_presets.java:1005 build/trans_presets.java:1014
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:448 build/trans_presets.java:578
+#: build/trans_presets.java:857 build/trans_presets.java:867
+#: build/trans_presets.java:876 build/trans_presets.java:888
+#: build/trans_presets.java:902 build/trans_presets.java:924
+#: build/trans_presets.java:967 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1016 build/trans_presets.java:1028
+#: build/trans_presets.java:1038 build/trans_presets.java:1047
+#: build/trans_presets.java:1056
 msgid "Foot"
 msgstr "Te voet"
@@ -15184 +15455 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:496
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:502
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:39
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
@@ -16382 +16653 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 #, java-format
 msgid ""
@@ -16390 +16660 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:457
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481
 #, java-format
 msgid ""
@@ -16398 +16667 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:939
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:976
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:943
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1034
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:944
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:945
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:946
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:966
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1100
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1029
 #, 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:1101
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1030
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Voorkeuze ''{0}'' gebruiken"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1081
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1221
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1150
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1158
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1269
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -16460 +16729 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1279
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1208
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1249
 #, 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:1399
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1328
 #: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
@@ -16478 +16747 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1402
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1404
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342
 msgid "New relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1505
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1434
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16860 +17129 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:243
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:242
 #, java-format
 msgid "Failed to rename file {0} to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:248
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:247
 #, java-format
 msgid "Failed to load {0}, use cached file and retry next time: {1}"
@@ -16871 +17140 @@
 
 #. I18n: argument is HTTP response code
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:300
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:299
 #, java-format
 msgid ""
@@ -16878 +17147 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:308
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:307
 msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:311
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:310
 #, java-format
 msgid "Download redirected to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:314
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:313
 #, java-format
 msgid "Failed to read from ''{0}''. Server responded with status code {1}."
@@ -17724 +17993 @@
 
 #: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103
-msgid ""
-"Warning: Could not detect type of imagery source '{0}'. Using default (xml)."
+#, java-format
+msgid ""
+"Warning: Could not detect type of imagery source ''{0}''. Using default "
+"(xml)."
 msgstr ""
 
@@ -18538 +18809 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:602
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:604
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -19025 +19296 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:482
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:488
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33
 msgid "Refresh"
@@ -19342 +19613 @@
 msgstr ""
 
+#. Plugin merge-overlap
+#: build/trans_plugins.java:79
+msgid "Merge overlapping part of ways."
+msgstr ""
+
 #. Plugin michigan_left
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
+#, fuzzy
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
+"De stijl voor één van de wegen met als rol inner is gelijk aan multipolygon"
 
 #. Plugin namemanager
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
 
 #. Plugin native_password_manager
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "Use your system''s password manager to store the API username and password. "
@@ -19365 +19643 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -19373 +19651 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -19389 +19667 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -19395 +19673 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid "Import PDF file and convert to ways."
 msgstr ""
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -19407 +19685 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:103
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -19414 +19692 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:105
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin proj4j
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -19430 +19708 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:109
+#: build/trans_plugins.java:111
 msgid "Relation and multipolygon creating and editing panel."
 msgstr ""
 
 #. Plugin restart
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -19458 +19736 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:121
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -19465 +19743 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -19478 +19756 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:125 build/trans_plugins.java:127
+#: build/trans_plugins.java:127 build/trans_plugins.java:129
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr ""
 
 #. Plugin surveyor
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:131
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -19501 +19779 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:137
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -19518 +19796 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19525 +19803 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -19536 +19814 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19543 +19821 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Several utilities that make your life easier."
 msgstr ""
 
 #. Plugin videomapping
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:155
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19561 +19839 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:157
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19568 +19846 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:159
+#: build/trans_plugins.java:161
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:161
+#: build/trans_plugins.java:163
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:163
+#: build/trans_plugins.java:165
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19742 +20020 @@
 #. item "Power/Cable Distribution Cabinet" text "Reference"
 #. item "Relations/Route" text "Reference"
+#. item "Relations/Directional Route (North America)" text "Reference"
 #: build/trans_presets.java:114 build/trans_presets.java:152
 #: build/trans_presets.java:173 build/trans_presets.java:194
-#: build/trans_presets.java:234 build/trans_presets.java:255
-#: build/trans_presets.java:1741 build/trans_presets.java:1749
-#: build/trans_presets.java:1757 build/trans_presets.java:1791
-#: build/trans_presets.java:2585 build/trans_presets.java:3115
-#: build/trans_presets.java:3131 build/trans_presets.java:4151
+#: build/trans_presets.java:236 build/trans_presets.java:258
+#: build/trans_presets.java:1875 build/trans_presets.java:1883
+#: build/trans_presets.java:1891 build/trans_presets.java:1925
+#: build/trans_presets.java:2730 build/trans_presets.java:3271
+#: build/trans_presets.java:3287 build/trans_presets.java:4319
+#: build/trans_presets.java:4349
 msgid "Reference"
 msgstr "Referentie"
@@ -19765 +20045 @@
 #: build/trans_presets.java:118 build/trans_presets.java:136
 #: build/trans_presets.java:156 build/trans_presets.java:176
-#: build/trans_presets.java:198 build/trans_presets.java:216
-#: build/trans_presets.java:238 build/trans_presets.java:259
-#: build/trans_presets.java:286 build/trans_presets.java:306
-#: build/trans_presets.java:478
+#: build/trans_presets.java:198 build/trans_presets.java:217
+#: build/trans_presets.java:240 build/trans_presets.java:262
+#: build/trans_presets.java:290 build/trans_presets.java:311
+#: build/trans_presets.java:489
 msgid "Lanes"
 msgstr "Lanen"
@@ -19793 +20073 @@
 #: build/trans_presets.java:119 build/trans_presets.java:137
 #: build/trans_presets.java:157 build/trans_presets.java:177
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:239 build/trans_presets.java:260
-#: build/trans_presets.java:287 build/trans_presets.java:307
-#: build/trans_presets.java:368 build/trans_presets.java:402
-#: build/trans_presets.java:423 build/trans_presets.java:452
-#: build/trans_presets.java:493 build/trans_presets.java:508
-#: build/trans_presets.java:571 build/trans_presets.java:591
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:200 build/trans_presets.java:219
+#: build/trans_presets.java:242 build/trans_presets.java:264
+#: build/trans_presets.java:291 build/trans_presets.java:312
+#: build/trans_presets.java:376 build/trans_presets.java:411
+#: 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:1388
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -19839 +20119 @@
 #: build/trans_presets.java:120 build/trans_presets.java:138
 #: build/trans_presets.java:158 build/trans_presets.java:178
-#: build/trans_presets.java:200 build/trans_presets.java:218
-#: build/trans_presets.java:240 build/trans_presets.java:261
-#: build/trans_presets.java:278 build/trans_presets.java:299
-#: build/trans_presets.java:320 build/trans_presets.java:339
-#: build/trans_presets.java:359 build/trans_presets.java:381
-#: build/trans_presets.java:394 build/trans_presets.java:414
-#: build/trans_presets.java:432 build/trans_presets.java:472
-#: build/trans_presets.java:530 build/trans_presets.java:562
-#: build/trans_presets.java:584 build/trans_presets.java:605
-#: build/trans_presets.java:629 build/trans_presets.java:652
-#: build/trans_presets.java:692 build/trans_presets.java:1348
+#: build/trans_presets.java:201 build/trans_presets.java:220
+#: build/trans_presets.java:243 build/trans_presets.java:265
+#: build/trans_presets.java:282 build/trans_presets.java:304
+#: build/trans_presets.java:326 build/trans_presets.java:346
+#: build/trans_presets.java:367 build/trans_presets.java:390
+#: 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:647 build/trans_presets.java:671
+#: build/trans_presets.java:713 build/trans_presets.java:1381
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -19890 +20170 @@
 #: build/trans_presets.java:121 build/trans_presets.java:139
 #: build/trans_presets.java:160 build/trans_presets.java:180
-#: build/trans_presets.java:202 build/trans_presets.java:220
-#: build/trans_presets.java:241 build/trans_presets.java:262
-#: build/trans_presets.java:279 build/trans_presets.java:300
-#: build/trans_presets.java:321 build/trans_presets.java:340
-#: build/trans_presets.java:360 build/trans_presets.java:395
-#: build/trans_presets.java:415 build/trans_presets.java:473
-#: build/trans_presets.java:482 build/trans_presets.java:489
-#: build/trans_presets.java:525 build/trans_presets.java:557
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:630 build/trans_presets.java:653
-#: build/trans_presets.java:672 build/trans_presets.java:693
-#: build/trans_presets.java:1349 build/trans_surveyor.java:12
+#: build/trans_presets.java:203 build/trans_presets.java:222
+#: build/trans_presets.java:244 build/trans_presets.java:266
+#: build/trans_presets.java:283 build/trans_presets.java:305
+#: build/trans_presets.java:327 build/trans_presets.java:347
+#: build/trans_presets.java:368 build/trans_presets.java:404
+#: 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:623
+#: build/trans_presets.java:648 build/trans_presets.java:672
+#: build/trans_presets.java:692 build/trans_presets.java:714
+#: build/trans_presets.java:1382 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brug"
@@ -19934 +20214 @@
 #: build/trans_presets.java:122 build/trans_presets.java:140
 #: build/trans_presets.java:161 build/trans_presets.java:181
-#: build/trans_presets.java:203 build/trans_presets.java:221
-#: build/trans_presets.java:242 build/trans_presets.java:263
-#: build/trans_presets.java:280 build/trans_presets.java:301
-#: build/trans_presets.java:322 build/trans_presets.java:341
-#: build/trans_presets.java:361 build/trans_presets.java:396
-#: build/trans_presets.java:416 build/trans_presets.java:474
-#: build/trans_presets.java:498 build/trans_presets.java:526
-#: build/trans_presets.java:558 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:631
-#: build/trans_presets.java:654 build/trans_presets.java:673
-#: build/trans_presets.java:694 build/trans_presets.java:1350
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:245 build/trans_presets.java:267
+#: build/trans_presets.java:284 build/trans_presets.java:306
+#: build/trans_presets.java:328 build/trans_presets.java:348
+#: 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:624 build/trans_presets.java:649
+#: build/trans_presets.java:673 build/trans_presets.java:693
+#: build/trans_presets.java:715 build/trans_presets.java:1383
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19975 +20255 @@
 #: build/trans_presets.java:123 build/trans_presets.java:141
 #: build/trans_presets.java:162 build/trans_presets.java:182
-#: build/trans_presets.java:204 build/trans_presets.java:222
-#: build/trans_presets.java:243 build/trans_presets.java:264
-#: build/trans_presets.java:281 build/trans_presets.java:302
-#: build/trans_presets.java:323 build/trans_presets.java:342
-#: build/trans_presets.java:362 build/trans_presets.java:397
-#: build/trans_presets.java:417 build/trans_presets.java:475
-#: build/trans_presets.java:527 build/trans_presets.java:559
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:632 build/trans_presets.java:655
-#: build/trans_presets.java:674 build/trans_presets.java:695
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:246 build/trans_presets.java:268
+#: build/trans_presets.java:285 build/trans_presets.java:307
+#: build/trans_presets.java:329 build/trans_presets.java:349
+#: 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:625
+#: build/trans_presets.java:650 build/trans_presets.java:674
+#: build/trans_presets.java:694 build/trans_presets.java:716
+#: build/trans_presets.java:1384
 msgid "Cutting"
 msgstr "Verdieping"
@@ -20016 +20296 @@
 #: build/trans_presets.java:124 build/trans_presets.java:142
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:205 build/trans_presets.java:223
-#: build/trans_presets.java:244 build/trans_presets.java:265
-#: build/trans_presets.java:282 build/trans_presets.java:303
-#: build/trans_presets.java:324 build/trans_presets.java:343
-#: build/trans_presets.java:363 build/trans_presets.java:398
-#: build/trans_presets.java:418 build/trans_presets.java:476
-#: build/trans_presets.java:528 build/trans_presets.java:560
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:633 build/trans_presets.java:656
-#: build/trans_presets.java:675 build/trans_presets.java:696
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:247 build/trans_presets.java:269
+#: build/trans_presets.java:286 build/trans_presets.java:308
+#: build/trans_presets.java:330 build/trans_presets.java:350
+#: 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:626
+#: build/trans_presets.java:651 build/trans_presets.java:675
+#: build/trans_presets.java:695 build/trans_presets.java:717
+#: build/trans_presets.java:1385
 msgid "Embankment"
 msgstr "Verhoging"
@@ -20057 +20337 @@
 #: build/trans_presets.java:125 build/trans_presets.java:143
 #: build/trans_presets.java:164 build/trans_presets.java:184
-#: build/trans_presets.java:206 build/trans_presets.java:224
-#: build/trans_presets.java:245 build/trans_presets.java:266
-#: build/trans_presets.java:283 build/trans_presets.java:304
-#: build/trans_presets.java:325 build/trans_presets.java:344
-#: build/trans_presets.java:364 build/trans_presets.java:383
-#: build/trans_presets.java:399 build/trans_presets.java:419
-#: build/trans_presets.java:529 build/trans_presets.java:561
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:634 build/trans_presets.java:657
-#: build/trans_presets.java:676 build/trans_presets.java:697
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:248 build/trans_presets.java:270
+#: build/trans_presets.java:287 build/trans_presets.java:309
+#: build/trans_presets.java:331 build/trans_presets.java:351
+#: 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:627
+#: build/trans_presets.java:652 build/trans_presets.java:676
+#: build/trans_presets.java:696 build/trans_presets.java:718
+#: build/trans_presets.java:2339
 msgid "Lit"
 msgstr "Verlicht"
@@ -20102 +20382 @@
 #. item "Highways/Streets/Primary Link" check "Motorroad"
 #: build/trans_presets.java:159 build/trans_presets.java:179
-#: build/trans_presets.java:201 build/trans_presets.java:219
+#: build/trans_presets.java:202 build/trans_presets.java:221
 msgid "Motorroad"
 msgstr "Autoweg"
@@ -20137 +20417 @@
 msgstr "Een S-weg bewerken"
 
+#. item "Highways/Streets/Primary" combo "Incline"
+#. item "Highways/Streets/Primary Link" combo "Incline"
+#. item "Highways/Streets/Secondary" combo "Incline"
+#. item "Highways/Streets/Tertiary" combo "Incline"
+#. item "Highways/Streets/Unclassified" combo "Incline"
+#. item "Highways/Streets/Residential" combo "Incline"
+#. item "Highways/Streets/Living Street" combo "Incline"
+#. item "Highways/Streets/Pedestrian" combo "Incline"
+#. item "Highways/Streets/Service" combo "Incline"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline"
+#. item "Highways/Streets/Construction" combo "Incline"
+#. item "Highways/Streets/Roundabout" combo "Incline"
+#. item "Highways/Streets/Bridge" combo "Incline"
+#. item "Highways/Streets/Tunnel" combo "Incline"
+#. item "Ways/Track" combo "Incline"
+#. item "Ways/Path" combo "Incline"
+#. item "Ways/Dedicated Bridleway" combo "Incline"
+#. item "Ways/Dedicated Cycleway" combo "Incline"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline"
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline"
+#. item "Ways/Dedicated Footway" combo "Incline"
+#. item "Transport/Railway/Bus Guideway" combo "Incline"
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "Incline"
+msgstr "Helling"
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "10%"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "-10%"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "10°"
+msgstr ""
+
+#. item "Highways/Streets/Primary" combo "Incline" display value
+#. item "Highways/Streets/Primary Link" combo "Incline" display value
+#. item "Highways/Streets/Secondary" combo "Incline" display value
+#. item "Highways/Streets/Tertiary" combo "Incline" display value
+#. item "Highways/Streets/Unclassified" combo "Incline" display value
+#. item "Highways/Streets/Residential" combo "Incline" display value
+#. item "Highways/Streets/Living Street" combo "Incline" display value
+#. item "Highways/Streets/Pedestrian" combo "Incline" display value
+#. item "Highways/Streets/Service" combo "Incline" display value
+#. item "Highways/Streets/Road (Unknown Type)" combo "Incline" display value
+#. item "Highways/Streets/Construction" combo "Incline" display value
+#. item "Highways/Streets/Roundabout" combo "Incline" display value
+#. item "Highways/Streets/Bridge" combo "Incline" display value
+#. item "Highways/Streets/Tunnel" combo "Incline" display value
+#. item "Ways/Track" combo "Incline" display value
+#. item "Ways/Path" combo "Incline" display value
+#. item "Ways/Dedicated Bridleway" combo "Incline" display value
+#. item "Ways/Dedicated Cycleway" combo "Incline" display value
+#. item "Ways/Segregated Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Combined Foot- and Cycleway" combo "Incline" display value
+#. item "Ways/Dedicated Footway" combo "Incline" display value
+#. item "Transport/Railway/Bus Guideway" combo "Incline" display value
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:241 build/trans_presets.java:263
+#: build/trans_presets.java:293 build/trans_presets.java:315
+#: build/trans_presets.java:335 build/trans_presets.java:355
+#: build/trans_presets.java:378 build/trans_presets.java:413
+#: 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:631
+#: build/trans_presets.java:655 build/trans_presets.java:680
+#: build/trans_presets.java:700 build/trans_presets.java:1390
+msgid "-10°"
+msgstr ""
+
 #. </optional>
 #. item "Highways/Streets/Primary Link"
-#: build/trans_presets.java:209
+#: build/trans_presets.java:210
 msgid "Primary Link"
 msgstr "S-wegverbinding"
@@ -20145 +20605 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary_link" />
 #. item "Highways/Streets/Primary Link" label "Edit Primary Link"
-#: build/trans_presets.java:211
+#: build/trans_presets.java:212
 msgid "Edit Primary Link"
 msgstr "Een S-wegverbinding bewerken"
@@ -20155 +20615 @@
 #. </button>
 #. <button label="Secondary" hotkey="3">
-#: build/trans_presets.java:227 build/trans_surveyor.java:80
+#: build/trans_presets.java:229 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "N-weg>400"
@@ -20163 +20623 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
 #. item "Highways/Streets/Secondary" label "Edit Secondary Road"
-#: build/trans_presets.java:231
+#: build/trans_presets.java:233
 msgid "Edit Secondary Road"
 msgstr "Een provinciale weg bewerken"
@@ -20169 +20629 @@
 #. </optional>
 #. item "Highways/Streets/Tertiary"
-#: build/trans_presets.java:248
+#: build/trans_presets.java:251
 msgid "Tertiary"
 msgstr "Tweebaansweg"
@@ -20177 +20637 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
 #. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
-#: build/trans_presets.java:252
+#: build/trans_presets.java:255
 msgid "Edit Tertiary Road"
 msgstr "Een tweebaansweg bewerken"
@@ -20187 +20647 @@
 #. </button>
 #. <button label="Unclassified" hotkey="4">
-#: build/trans_presets.java:269 build/trans_surveyor.java:84
+#: build/trans_presets.java:273 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Ongeklassificeerd"
@@ -20195 +20655 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
 #. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
-#: build/trans_presets.java:273
+#: build/trans_presets.java:277
 msgid "Edit Unclassified Road"
 msgstr "Een enkelbaansweg bewerken"
@@ -20203 +20663 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Dedicated Footway" check "Passing Places"
-#: build/trans_presets.java:284 build/trans_presets.java:365
-#: build/trans_presets.java:658 build/trans_presets.java:677
+#: build/trans_presets.java:288 build/trans_presets.java:373
+#: build/trans_presets.java:677 build/trans_presets.java:697
 msgid "Passing Places"
 msgstr "Uitwijkplaats"
@@ -20229 +20689 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:288 build/trans_presets.java:309
-#: build/trans_presets.java:328 build/trans_presets.java:347
-#: build/trans_presets.java:369 build/trans_presets.java:403
-#: build/trans_presets.java:424 build/trans_presets.java:479
-#: build/trans_presets.java:495 build/trans_presets.java:509
-#: build/trans_presets.java:536 build/trans_presets.java:572
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:636 build/trans_presets.java:660
-#: build/trans_presets.java:679 build/trans_presets.java:699
-#: build/trans_presets.java:1356 build/trans_presets.java:1652
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:292 build/trans_presets.java:314
+#: build/trans_presets.java:334 build/trans_presets.java:354
+#: build/trans_presets.java:377 build/trans_presets.java:412
+#: 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:630
+#: build/trans_presets.java:654 build/trans_presets.java:679
+#: build/trans_presets.java:699 build/trans_presets.java:720
+#: build/trans_presets.java:1389 build/trans_presets.java:1786
+#: build/trans_presets.java:1831
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -20249 +20709 @@
 #. </button>
 #. <button label="Residential" hotkey="5">
-#: build/trans_presets.java:291 build/trans_surveyor.java:88
+#: build/trans_presets.java:296 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Woongebied"
@@ -20256 +20716 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
 #. item "Highways/Streets/Residential" label "Edit Residential Street"
-#: build/trans_presets.java:294
+#: build/trans_presets.java:299
 msgid "Edit Residential Street"
 msgstr "Een straat bewerken"
@@ -20276 +20736 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -20303 +20763 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "paved"
 msgstr "verhard"
@@ -20329 +20789 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "unpaved"
 msgstr "onverhard"
@@ -20355 +20815 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "asphalt"
 msgstr "asfalt"
@@ -20382 +20842 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "concrete"
 msgstr "beton"
@@ -20409 +20869 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354 build/trans_presets.java:2549
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387 build/trans_presets.java:2694
 msgid "metal"
 msgstr "metaal"
@@ -20437 +20897 @@
 #. item "Leisure/Public Grill" combo "Fuel" display value
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354 build/trans_presets.java:2250
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387 build/trans_presets.java:2384
+#: build/trans_presets.java:2694
 msgid "wood"
 msgstr "oerbos"
@@ -20464 +20924 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "paving_stones"
 msgstr "klinkers"
@@ -20491 +20951 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
@@ -20518 +20978 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "gravel"
 msgstr "gravel"
@@ -20544 +21004 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "pebblestone"
 msgstr "kiezelsteen"
@@ -20570 +21030 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "compacted"
 msgstr "aangestampt"
@@ -20596 +21056 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:555
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:628 build/trans_presets.java:651
-#: build/trans_presets.java:671 build/trans_presets.java:691
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621
+#: build/trans_presets.java:646 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:712
+#: build/trans_presets.java:1387
 msgid "grass_paver"
 msgstr "grasdal"
@@ -20623 +21083 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "grass"
 msgstr "gras"
@@ -20650 +21110 @@
 #. item "Ways/Steps" combo "Surface" display value
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
 msgid "sand"
 msgstr "zand"
@@ -20678 +21138 @@
 #. item "Transport/Railway/Bus Guideway" combo "Surface" display value
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:308 build/trans_presets.java:327
-#: build/trans_presets.java:346 build/trans_presets.java:367
-#: build/trans_presets.java:382 build/trans_presets.java:401
-#: build/trans_presets.java:421 build/trans_presets.java:523
-#: build/trans_presets.java:555 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:628
-#: build/trans_presets.java:651 build/trans_presets.java:671
-#: build/trans_presets.java:691 build/trans_presets.java:1354
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:313 build/trans_presets.java:333
+#: 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:621 build/trans_presets.java:646
+#: build/trans_presets.java:670 build/trans_presets.java:691
+#: build/trans_presets.java:712 build/trans_presets.java:1387
+#: build/trans_presets.java:2663
 msgid "ground"
 msgstr "gebied"
@@ -20692 +21152 @@
 #. </optional>
 #. item "Highways/Streets/Living Street"
-#: build/trans_presets.java:312
+#: build/trans_presets.java:318
 msgid "Living Street"
 msgstr "Woonerf"
@@ -20699 +21159 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
 #. item "Highways/Streets/Living Street" label "Edit Living Street"
-#: build/trans_presets.java:315
+#: build/trans_presets.java:321
 msgid "Edit Living Street"
 msgstr "Een woonerf bewerken"
@@ -20705 +21165 @@
 #. </optional>
 #. item "Highways/Streets/Pedestrian"
-#: build/trans_presets.java:331
+#: build/trans_presets.java:338
 msgid "Pedestrian"
 msgstr "Voetgangers"
@@ -20712 +21172 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
 #. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:341
 msgid "Edit Pedestrian Street"
 msgstr "Voetgangerszone bewerken"
@@ -20718 +21178 @@
 #. </optional>
 #. item "Highways/Streets/Service"
-#: build/trans_presets.java:350
+#: build/trans_presets.java:358
 msgid "Service"
 msgstr "Toegangsweg"
@@ -20725 +21185 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
 #. item "Highways/Streets/Service" label "Edit Serviceway"
-#: build/trans_presets.java:353
+#: build/trans_presets.java:361
 msgid "Edit Serviceway"
 msgstr "Een toegangsweg bewerken"
@@ -20733 +21193 @@
 #. <optional>
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "Serviceway type"
 msgstr "Dienstwegtype"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "alley"
 msgstr "steeg"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "driveway"
 msgstr "oprit"
 
 #. item "Highways/Streets/Service" combo "Serviceway type" display value
-#: build/trans_presets.java:357
+#: build/trans_presets.java:365
 msgid "parking_aisle"
 msgstr "parkeergang"
@@ -20754 +21214 @@
 #. </optional>
 #. item "Highways/Streets/Parking Aisle"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:381
 msgid "Parking Aisle"
 msgstr "Parkeergang"
@@ -20762 +21222 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
 #. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
-#: build/trans_presets.java:376
+#: build/trans_presets.java:385
 msgid "Edit Parking Aisle"
 msgstr "Een parkeergang bewerken"
@@ -20768 +21228 @@
 #. </optional>
 #. item "Highways/Streets/Road (Unknown Type)"
-#: build/trans_presets.java:386
+#: build/trans_presets.java:395
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -20775 +21235 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
 #. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
-#: build/trans_presets.java:389
+#: build/trans_presets.java:398
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -20781 +21241 @@
 #. </optional>
 #. item "Highways/Streets/Construction"
-#: build/trans_presets.java:406
+#: build/trans_presets.java:416
 msgid "Construction"
 msgstr "Werkzaamheden"
 
 #. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
-#: build/trans_presets.java:407
+#: build/trans_presets.java:417
 msgid "Edit Highway Under Construction"
 msgstr "Een autosnelweg met werkzaamheden bewerken"
 
 #. item "Highways/Streets/Construction" combo "Junction"
-#: build/trans_presets.java:422
+#: build/trans_presets.java:432
 msgid "Junction"
 msgstr "Splitsing"
@@ -20835 +21295 @@
 #. <condition k="junction" v="roundabout"/>
 #. color roundabout
-#: build/trans_presets.java:422 build/trans_style.java:744
+#: build/trans_presets.java:432 build/trans_style.java:744
 msgid "roundabout"
 msgstr "rotonde"
 
 #. item "Highways/Streets/Construction" combo "Junction" display value
-#: build/trans_presets.java:422
+#: build/trans_presets.java:432
 msgid "jughandle"
 msgstr ""
@@ -20970 +21430 @@
 #. item "Facilities/Hunting Stand" combo "Lock" display value
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
-#: build/trans_presets.java:422 build/trans_presets.java:436
-#: build/trans_presets.java:437 build/trans_presets.java:438
-#: build/trans_presets.java:440 build/trans_presets.java:441
-#: build/trans_presets.java:442 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:448
-#: build/trans_presets.java:449 build/trans_presets.java:450
-#: build/trans_presets.java:451 build/trans_presets.java:489
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:611
-#: build/trans_presets.java:775 build/trans_presets.java:1264
-#: build/trans_presets.java:1276 build/trans_presets.java:1288
-#: build/trans_presets.java:1300 build/trans_presets.java:1312
-#: build/trans_presets.java:1324 build/trans_presets.java:1336
-#: build/trans_presets.java:1447 build/trans_presets.java:1448
-#: build/trans_presets.java:1451 build/trans_presets.java:1452
-#: build/trans_presets.java:1453 build/trans_presets.java:1468
-#: build/trans_presets.java:1559 build/trans_presets.java:1571
-#: build/trans_presets.java:1572 build/trans_presets.java:1573
-#: build/trans_presets.java:1574 build/trans_presets.java:1575
-#: build/trans_presets.java:1686 build/trans_presets.java:1687
-#: build/trans_presets.java:1688 build/trans_presets.java:1806
-#: build/trans_presets.java:1807 build/trans_presets.java:1808
-#: build/trans_presets.java:1809 build/trans_presets.java:1824
-#: build/trans_presets.java:1825 build/trans_presets.java:1826
-#: build/trans_presets.java:1827 build/trans_presets.java:1840
-#: build/trans_presets.java:1841 build/trans_presets.java:1842
-#: build/trans_presets.java:1843 build/trans_presets.java:1857
-#: build/trans_presets.java:1858 build/trans_presets.java:1859
-#: build/trans_presets.java:1860 build/trans_presets.java:1875
-#: build/trans_presets.java:1876 build/trans_presets.java:1877
-#: build/trans_presets.java:1878 build/trans_presets.java:1892
-#: build/trans_presets.java:1893 build/trans_presets.java:1894
-#: build/trans_presets.java:1895 build/trans_presets.java:1909
-#: build/trans_presets.java:1910 build/trans_presets.java:1911
-#: build/trans_presets.java:1912 build/trans_presets.java:1915
-#: build/trans_presets.java:1931 build/trans_presets.java:1932
-#: build/trans_presets.java:1933 build/trans_presets.java:1934
-#: build/trans_presets.java:1954 build/trans_presets.java:1955
-#: build/trans_presets.java:1956 build/trans_presets.java:1957
-#: build/trans_presets.java:1973 build/trans_presets.java:1974
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:432 build/trans_presets.java:447
+#: build/trans_presets.java:448 build/trans_presets.java:449
+#: build/trans_presets.java:451 build/trans_presets.java:452
+#: 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:459
+#: 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:628
+#: build/trans_presets.java:796 build/trans_presets.java:1297
+#: 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:1581 build/trans_presets.java:1582
+#: build/trans_presets.java:1585 build/trans_presets.java:1586
+#: build/trans_presets.java:1587 build/trans_presets.java:1602
+#: build/trans_presets.java:1693 build/trans_presets.java:1705
+#: build/trans_presets.java:1706 build/trans_presets.java:1707
+#: build/trans_presets.java:1708 build/trans_presets.java:1709
+#: build/trans_presets.java:1820 build/trans_presets.java:1821
+#: build/trans_presets.java:1822 build/trans_presets.java:1940
+#: build/trans_presets.java:1941 build/trans_presets.java:1942
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
+#: build/trans_presets.java:1959 build/trans_presets.java:1960
+#: build/trans_presets.java:1961 build/trans_presets.java:1974
 #: build/trans_presets.java:1975 build/trans_presets.java:1976
-#: build/trans_presets.java:1990 build/trans_presets.java:1991
+#: build/trans_presets.java:1977 build/trans_presets.java:1991
 #: build/trans_presets.java:1992 build/trans_presets.java:1993
-#: build/trans_presets.java:2009 build/trans_presets.java:2010
-#: build/trans_presets.java:2011 build/trans_presets.java:2012
-#: build/trans_presets.java:2028 build/trans_presets.java:2029
-#: build/trans_presets.java:2030 build/trans_presets.java:2031
+#: build/trans_presets.java:1994 build/trans_presets.java:2009
+#: build/trans_presets.java:2010 build/trans_presets.java:2011
+#: build/trans_presets.java:2012 build/trans_presets.java:2026
+#: build/trans_presets.java:2027 build/trans_presets.java:2028
+#: build/trans_presets.java:2029 build/trans_presets.java:2043
 #: build/trans_presets.java:2044 build/trans_presets.java:2045
-#: build/trans_presets.java:2046 build/trans_presets.java:2047
-#: build/trans_presets.java:2061 build/trans_presets.java:2062
-#: build/trans_presets.java:2063 build/trans_presets.java:2064
-#: build/trans_presets.java:2078 build/trans_presets.java:2079
-#: build/trans_presets.java:2157 build/trans_presets.java:2167
-#: build/trans_presets.java:2228 build/trans_presets.java:2249
-#: build/trans_presets.java:2434 build/trans_presets.java:2489
-#: build/trans_presets.java:2490 build/trans_presets.java:2548
-#: build/trans_presets.java:2564 build/trans_presets.java:2565
-#: build/trans_presets.java:2566 build/trans_presets.java:2997
+#: build/trans_presets.java:2046 build/trans_presets.java:2049
+#: build/trans_presets.java:2065 build/trans_presets.java:2066
+#: build/trans_presets.java:2067 build/trans_presets.java:2068
+#: build/trans_presets.java:2088 build/trans_presets.java:2089
+#: build/trans_presets.java:2090 build/trans_presets.java:2091
+#: build/trans_presets.java:2107 build/trans_presets.java:2108
+#: build/trans_presets.java:2109 build/trans_presets.java:2110
+#: build/trans_presets.java:2124 build/trans_presets.java:2125
+#: build/trans_presets.java:2126 build/trans_presets.java:2127
+#: build/trans_presets.java:2143 build/trans_presets.java:2144
+#: build/trans_presets.java:2145 build/trans_presets.java:2146
+#: build/trans_presets.java:2162 build/trans_presets.java:2163
+#: build/trans_presets.java:2164 build/trans_presets.java:2165
+#: build/trans_presets.java:2178 build/trans_presets.java:2179
+#: build/trans_presets.java:2180 build/trans_presets.java:2181
+#: build/trans_presets.java:2195 build/trans_presets.java:2196
+#: build/trans_presets.java:2197 build/trans_presets.java:2198
+#: build/trans_presets.java:2212 build/trans_presets.java:2213
+#: build/trans_presets.java:2291 build/trans_presets.java:2301
+#: build/trans_presets.java:2362 build/trans_presets.java:2383
+#: build/trans_presets.java:2582 build/trans_presets.java:2634
+#: build/trans_presets.java:2635 build/trans_presets.java:2693
+#: build/trans_presets.java:2709 build/trans_presets.java:2710
+#: build/trans_presets.java:2711 build/trans_presets.java:3142
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698
@@ -21041 +21515 @@
 #. <separator/>
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:428
+#: build/trans_presets.java:439
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
@@ -21048 +21522 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
-#: build/trans_presets.java:431
+#: build/trans_presets.java:442
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:433
+#: build/trans_presets.java:444
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
-#: build/trans_presets.java:434
+#: build/trans_presets.java:445
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
 
 #. item "Highways/Streets/Road Restrictions" label "Transport mode restrictions"
-#: build/trans_presets.java:435
+#: build/trans_presets.java:446
 msgid "Transport mode restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "General Access"
-#: build/trans_presets.java:436
+#: build/trans_presets.java:447
 msgid "General Access"
 msgstr ""
@@ -21099 +21573 @@
 #. <condition k="access" v="destination"/>
 #. color destination
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:568
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 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: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_style.java:179
 msgid "destination"
@@ -21132 +21606 @@
 #. item "Ways/Path" combo "Horse" display value
 #. item "Ways/Path" combo "Snowmobile" display value
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:568
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 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:578 build/trans_presets.java:579
+#: build/trans_presets.java:580 build/trans_presets.java:583
 msgid "delivery"
 msgstr "levering"
@@ -21181 +21655 @@
 #. <condition k="access" v="permissive"/>
 #. color permissive
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:567
-#: build/trans_presets.java:568 build/trans_presets.java:2228
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 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: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:2362
 #: build/trans_style.java:169
 msgid "permissive"
@@ -21226 +21700 @@
 #. <condition k="access" v="private"/>
 #. color private
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:563 build/trans_presets.java:564
-#: build/trans_presets.java:565 build/trans_presets.java:567
-#: build/trans_presets.java:568 build/trans_presets.java:2228
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 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: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:2362
 #: build/trans_style.java:174
 msgid "private"
@@ -21253 +21727 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:436 build/trans_presets.java:440
-#: build/trans_presets.java:442 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535
+#: build/trans_presets.java:447 build/trans_presets.java:451
+#: 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
 msgid "agricultural"
 msgstr "landbouw"
@@ -21273 +21747 @@
 #. item "Ways/Track" combo "Motorcycle" display value
 #. item "Ways/Track" combo "Motorcar" display value
-#: build/trans_presets.java:436 build/trans_presets.java:440
-#: build/trans_presets.java:442 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535
+#: build/trans_presets.java:447 build/trans_presets.java:451
+#: 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
 msgid "forestry"
 msgstr "bos"
@@ -21409 +21883 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:436 build/trans_presets.java:437
-#: build/trans_presets.java:438 build/trans_presets.java:440
-#: build/trans_presets.java:441 build/trans_presets.java:442
-#: build/trans_presets.java:443 build/trans_presets.java:444
-#: build/trans_presets.java:445 build/trans_presets.java:446
-#: build/trans_presets.java:448 build/trans_presets.java:449
-#: build/trans_presets.java:450 build/trans_presets.java:451
-#: build/trans_presets.java:532 build/trans_presets.java:533
-#: build/trans_presets.java:534 build/trans_presets.java:535
-#: build/trans_presets.java:556 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:565
-#: build/trans_presets.java:566 build/trans_presets.java:567
-#: build/trans_presets.java:568 build/trans_presets.java:569
-#: build/trans_presets.java:611 build/trans_presets.java:744
-#: build/trans_presets.java:766 build/trans_presets.java:1264
-#: build/trans_presets.java:1276 build/trans_presets.java:1288
-#: build/trans_presets.java:1300 build/trans_presets.java:1312
-#: build/trans_presets.java:1324 build/trans_presets.java:1336
-#: build/trans_presets.java:1378 build/trans_presets.java:1447
-#: build/trans_presets.java:1448 build/trans_presets.java:1451
-#: build/trans_presets.java:1452 build/trans_presets.java:1453
-#: build/trans_presets.java:1468 build/trans_presets.java:1559
-#: build/trans_presets.java:1571 build/trans_presets.java:1572
-#: build/trans_presets.java:1573 build/trans_presets.java:1574
-#: build/trans_presets.java:1575 build/trans_presets.java:1686
-#: build/trans_presets.java:1687 build/trans_presets.java:1688
-#: build/trans_presets.java:1806 build/trans_presets.java:1807
-#: build/trans_presets.java:1808 build/trans_presets.java:1809
-#: build/trans_presets.java:1824 build/trans_presets.java:1825
-#: build/trans_presets.java:1826 build/trans_presets.java:1827
-#: build/trans_presets.java:1840 build/trans_presets.java:1841
-#: build/trans_presets.java:1842 build/trans_presets.java:1843
-#: build/trans_presets.java:1857 build/trans_presets.java:1858
-#: build/trans_presets.java:1859 build/trans_presets.java:1860
-#: build/trans_presets.java:1875 build/trans_presets.java:1876
-#: build/trans_presets.java:1877 build/trans_presets.java:1878
-#: build/trans_presets.java:1892 build/trans_presets.java:1893
-#: build/trans_presets.java:1894 build/trans_presets.java:1895
-#: build/trans_presets.java:1909 build/trans_presets.java:1910
-#: build/trans_presets.java:1911 build/trans_presets.java:1912
-#: build/trans_presets.java:1915 build/trans_presets.java:1931
-#: build/trans_presets.java:1932 build/trans_presets.java:1933
-#: build/trans_presets.java:1934 build/trans_presets.java:1954
-#: build/trans_presets.java:1955 build/trans_presets.java:1956
-#: build/trans_presets.java:1957 build/trans_presets.java:1973
+#: build/trans_presets.java:447 build/trans_presets.java:448
+#: build/trans_presets.java:449 build/trans_presets.java:451
+#: build/trans_presets.java:452 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: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:628 build/trans_presets.java:765
+#: build/trans_presets.java:787 build/trans_presets.java:1297
+#: 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:1412 build/trans_presets.java:1581
+#: build/trans_presets.java:1582 build/trans_presets.java:1585
+#: build/trans_presets.java:1586 build/trans_presets.java:1587
+#: build/trans_presets.java:1602 build/trans_presets.java:1693
+#: build/trans_presets.java:1705 build/trans_presets.java:1706
+#: build/trans_presets.java:1707 build/trans_presets.java:1708
+#: build/trans_presets.java:1709 build/trans_presets.java:1820
+#: build/trans_presets.java:1821 build/trans_presets.java:1822
+#: build/trans_presets.java:1940 build/trans_presets.java:1941
+#: build/trans_presets.java:1942 build/trans_presets.java:1943
+#: build/trans_presets.java:1958 build/trans_presets.java:1959
+#: build/trans_presets.java:1960 build/trans_presets.java:1961
 #: build/trans_presets.java:1974 build/trans_presets.java:1975
-#: build/trans_presets.java:1976 build/trans_presets.java:1990
+#: build/trans_presets.java:1976 build/trans_presets.java:1977
 #: build/trans_presets.java:1991 build/trans_presets.java:1992
-#: build/trans_presets.java:1993 build/trans_presets.java:2009
-#: build/trans_presets.java:2010 build/trans_presets.java:2011
-#: build/trans_presets.java:2012 build/trans_presets.java:2028
-#: build/trans_presets.java:2029 build/trans_presets.java:2030
-#: build/trans_presets.java:2031 build/trans_presets.java:2044
+#: build/trans_presets.java:1993 build/trans_presets.java:1994
+#: build/trans_presets.java:2009 build/trans_presets.java:2010
+#: build/trans_presets.java:2011 build/trans_presets.java:2012
+#: build/trans_presets.java:2026 build/trans_presets.java:2027
+#: build/trans_presets.java:2028 build/trans_presets.java:2029
+#: build/trans_presets.java:2043 build/trans_presets.java:2044
 #: build/trans_presets.java:2045 build/trans_presets.java:2046
-#: build/trans_presets.java:2047 build/trans_presets.java:2061
-#: build/trans_presets.java:2062 build/trans_presets.java:2063
-#: build/trans_presets.java:2064 build/trans_presets.java:2078
-#: build/trans_presets.java:2079 build/trans_presets.java:2157
-#: build/trans_presets.java:2167 build/trans_presets.java:2249
-#: build/trans_presets.java:2434 build/trans_presets.java:2489
-#: build/trans_presets.java:2490 build/trans_presets.java:2548
-#: build/trans_presets.java:2564 build/trans_presets.java:2565
-#: build/trans_presets.java:2566 build/trans_presets.java:2997
-#: build/trans_presets.java:3080 build/trans_presets.java:3081
+#: build/trans_presets.java:2049 build/trans_presets.java:2065
+#: build/trans_presets.java:2066 build/trans_presets.java:2067
+#: build/trans_presets.java:2068 build/trans_presets.java:2088
+#: build/trans_presets.java:2089 build/trans_presets.java:2090
+#: build/trans_presets.java:2091 build/trans_presets.java:2107
+#: build/trans_presets.java:2108 build/trans_presets.java:2109
+#: build/trans_presets.java:2110 build/trans_presets.java:2124
+#: build/trans_presets.java:2125 build/trans_presets.java:2126
+#: build/trans_presets.java:2127 build/trans_presets.java:2143
+#: build/trans_presets.java:2144 build/trans_presets.java:2145
+#: build/trans_presets.java:2146 build/trans_presets.java:2162
+#: build/trans_presets.java:2163 build/trans_presets.java:2164
+#: build/trans_presets.java:2165 build/trans_presets.java:2178
+#: build/trans_presets.java:2179 build/trans_presets.java:2180
+#: build/trans_presets.java:2181 build/trans_presets.java:2195
+#: build/trans_presets.java:2196 build/trans_presets.java:2197
+#: build/trans_presets.java:2198 build/trans_presets.java:2212
+#: build/trans_presets.java:2213 build/trans_presets.java:2291
+#: build/trans_presets.java:2301 build/trans_presets.java:2383
+#: build/trans_presets.java:2582 build/trans_presets.java:2634
+#: build/trans_presets.java:2635 build/trans_presets.java:2693
+#: build/trans_presets.java:2709 build/trans_presets.java:2710
+#: build/trans_presets.java:2711 build/trans_presets.java:3142
+#: build/trans_presets.java:3225
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699
@@ -21500 +21973 @@
 #. item "Ways/Path" combo "Ski" display value
 #. item "Ways/Path" combo "Snowmobile" display value
-#: build/trans_presets.java:437 build/trans_presets.java:438
-#: build/trans_presets.java:441 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:448
-#: build/trans_presets.java:449 build/trans_presets.java:450
-#: build/trans_presets.java:451 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:565
-#: build/trans_presets.java:566 build/trans_presets.java:567
-#: build/trans_presets.java:568
+#: build/trans_presets.java:448 build/trans_presets.java:449
+#: build/trans_presets.java:452 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: 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
 msgid "official"
 msgstr "officieel"
@@ -21535 +22008 @@
 #. item "Ways/Path" combo "Snowmobile" display value
 #. item "Ways/Path" combo "Motorcar" display value
-#: build/trans_presets.java:437 build/trans_presets.java:438
-#: build/trans_presets.java:441 build/trans_presets.java:443
-#: build/trans_presets.java:444 build/trans_presets.java:445
-#: build/trans_presets.java:446 build/trans_presets.java:448
-#: build/trans_presets.java:449 build/trans_presets.java:450
-#: build/trans_presets.java:451 build/trans_presets.java:532
-#: build/trans_presets.java:533 build/trans_presets.java:534
-#: build/trans_presets.java:535 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:565
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:569
+#: build/trans_presets.java:448 build/trans_presets.java:449
+#: build/trans_presets.java:452 build/trans_presets.java:454
+#: build/trans_presets.java:455 build/trans_presets.java:456
+#: 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
 msgid "designated"
 msgstr "bestemmingsverkeer"
@@ -21552 +22025 @@
 #. item "Ways/Path" combo "Horse"
 #. item "Barriers/Bollard" check "Horse"
+#. item "Barriers/Cycle Barrier" check "Horse"
+#. item "Barriers/Block" check "Horse"
 #. item "Barriers/Spikes" check "Horse"
 #. item "Barriers/Border Control" check "Horse"
@@ -21560 +22035 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:438 build/trans_presets.java:565
-#: build/trans_presets.java:844 build/trans_presets.java:877
-#: build/trans_presets.java:899 build/trans_presets.java:936
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:449 build/trans_presets.java:580
+#: build/trans_presets.java:859 build/trans_presets.java:869
+#: build/trans_presets.java:878 build/trans_presets.java:904
+#: build/trans_presets.java:926 build/trans_presets.java:969
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1006 build/trans_presets.java:1018
+#: build/trans_presets.java:1058
 msgid "Horse"
 msgstr "Ruiters"
 
 #. item "Highways/Streets/Road Restrictions" label "Vehicles per type"
-#: build/trans_presets.java:439
+#: build/trans_presets.java:450
 msgid "Vehicles per type"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "All vehicles"
-#: build/trans_presets.java:440
+#: build/trans_presets.java:451
 msgid "All vehicles"
 msgstr ""
@@ -21581 +22057 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motor vehicles"
 #. item "Ways/Track" combo "Motor vehicles"
-#: build/trans_presets.java:442 build/trans_presets.java:533
+#: build/trans_presets.java:453 build/trans_presets.java:547
 msgid "Motor vehicles"
 msgstr ""
@@ -21588 +22064 @@
 #. item "Ways/Track" combo "Motorcycle"
 #. item "Barriers/Bollard" check "Motorcycle"
+#. item "Barriers/Cycle Barrier" check "Motorcycle"
+#. item "Barriers/Block" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
@@ -21598 +22076 @@
 #. item "Barriers/Sally Port" check "Motorcycle"
 #. group "Motorcycle"
-#: build/trans_presets.java:443 build/trans_presets.java:534
-#: build/trans_presets.java:845 build/trans_presets.java:863
-#: build/trans_presets.java:878 build/trans_presets.java:900
-#: build/trans_presets.java:937 build/trans_presets.java:950
-#: build/trans_presets.java:962 build/trans_presets.java:974
-#: build/trans_presets.java:986 build/trans_presets.java:1026
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:454 build/trans_presets.java:548
+#: build/trans_presets.java:860 build/trans_presets.java:870
+#: build/trans_presets.java:879 build/trans_presets.java:890
+#: build/trans_presets.java:905 build/trans_presets.java:927
+#: build/trans_presets.java:970 build/trans_presets.java:983
+#: build/trans_presets.java:995 build/trans_presets.java:1007
+#: build/trans_presets.java:1019 build/trans_presets.java:1059
+#: build/trans_presets.java:1686
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -21620 +22099 @@
 #. item "Barriers/Bump Gate" check "Motorcar"
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:444 build/trans_presets.java:535
-#: build/trans_presets.java:569 build/trans_presets.java:864
-#: build/trans_presets.java:879 build/trans_presets.java:901
-#: build/trans_presets.java:938 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:1027
+#: build/trans_presets.java:455 build/trans_presets.java:549
+#: build/trans_presets.java:584 build/trans_presets.java:891
+#: build/trans_presets.java:906 build/trans_presets.java:928
+#: build/trans_presets.java:971 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1020 build/trans_presets.java:1060
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
 #. item "Highways/Streets/Road Restrictions" combo "Light Commercial Vehicles (goods)"
-#: build/trans_presets.java:445
+#: build/trans_presets.java:456
 msgid "Light Commercial Vehicles (goods)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#: build/trans_presets.java:446
+#: build/trans_presets.java:457
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
 
 #. item "Highways/Streets/Road Restrictions" label "Vehicles per use"
-#: build/trans_presets.java:447
+#: build/trans_presets.java:458
 msgid "Vehicles per use"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Agricultural"
-#: build/trans_presets.java:448
+#: build/trans_presets.java:459
 msgid "Agricultural"
 msgstr "Landbouw"
 
 #. item "Highways/Streets/Road Restrictions" combo "Emergency vehicles"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:460
 msgid "Emergency vehicles"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "High-occupancy vehicles (hov)"
-#: build/trans_presets.java:450
+#: build/trans_presets.java:461
 msgid "High-occupancy vehicles (hov)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#: build/trans_presets.java:451
+#: build/trans_presets.java:462
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
-#: build/trans_presets.java:453
+#: build/trans_presets.java:464
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -21671 +22150 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
-#: build/trans_presets.java:454 build/trans_presets.java:494
+#: build/trans_presets.java:465 build/trans_presets.java:506
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
-#: build/trans_presets.java:455
+#: build/trans_presets.java:466
 msgid "Max. axleload (tonnes)"
 msgstr "Max. Asgewicht (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. height (meters)"
-#: build/trans_presets.java:456
+#: build/trans_presets.java:467
 msgid "Max. height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. width (meters)"
-#: build/trans_presets.java:457
+#: build/trans_presets.java:468
 msgid "Max. width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. length (meters)"
-#: build/trans_presets.java:458
+#: build/trans_presets.java:469
 msgid "Max. length (meters)"
 msgstr ""
@@ -21697 +22176 @@
 #. <separator/>
 #. item "Highways/Streets/Roundabout"
-#: build/trans_presets.java:461
+#: build/trans_presets.java:472
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -21706 +22185 @@
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
-#: build/trans_presets.java:466
+#: build/trans_presets.java:477
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -21722 +22201 @@
 #. <condition k="highway" v="motorway_link"/>
 #. color motorway
-#: build/trans_presets.java:469 build/trans_style.java:417
+#: build/trans_presets.java:480 build/trans_style.java:417
 #: build/trans_style.java:423
 msgid "motorway"
@@ -21728 +22207 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -21745 +22224 @@
 #. <condition k="highway" v="trunk_link"/>
 #. color trunk
-#: build/trans_presets.java:469 build/trans_style.java:429
+#: build/trans_presets.java:480 build/trans_style.java:429
 #: build/trans_style.java:435
 msgid "trunk"
@@ -21751 +22230 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -21768 +22247 @@
 #. <condition k="highway" v="primary_link"/>
 #. color primary
-#: build/trans_presets.java:469 build/trans_style.java:441
+#: build/trans_presets.java:480 build/trans_style.java:441
 #: build/trans_style.java:447
 msgid "primary"
@@ -21774 +22253 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -21791 +22270 @@
 #. <condition k="highway" v="secondary_link"/>
 #. color secondary
-#: build/trans_presets.java:469 build/trans_style.java:453
+#: build/trans_presets.java:480 build/trans_style.java:453
 #: build/trans_style.java:459
 msgid "secondary"
@@ -21809 +22288 @@
 #. <condition k="highway" v="tertiary_link"/>
 #. color tertiary
-#: build/trans_presets.java:469 build/trans_style.java:465
+#: build/trans_presets.java:480 build/trans_style.java:465
 #: build/trans_style.java:471
 msgid "tertiary"
@@ -21815 +22294 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -21826 +22305 @@
 #. <condition k="landuse" v="residential"/>
 #. color residential
-#: build/trans_presets.java:469 build/trans_style.java:2748
+#: build/trans_presets.java:480 build/trans_style.java:2748
 msgid "residential"
 msgstr "woongebied"
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "living_street"
 msgstr "woonerf"
@@ -21869 +22348 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10"/>
 #. color service
-#: build/trans_presets.java:469 build/trans_style.java:513
+#: build/trans_presets.java:480 build/trans_style.java:513
 #: build/trans_style.java:3662
 msgid "service"
@@ -21875 +22354 @@
 
 #. item "Highways/Streets/Roundabout" combo "Type" display value
-#: build/trans_presets.java:469
+#: build/trans_presets.java:480
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -21897 +22376 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:469 build/trans_style.java:698
+#: build/trans_presets.java:480 build/trans_style.java:698
 #: build/trans_style.java:2803 build/trans_style.java:2804
 msgid "construction"
@@ -21907 +22386 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
-#: build/trans_presets.java:487
+#: build/trans_presets.java:499
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:489
+#: build/trans_presets.java:501
 msgid "viaduct"
 msgstr "viaduct"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:489
+#: build/trans_presets.java:501
 msgid "swing"
 msgstr ""
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
-#: build/trans_presets.java:489
+#: build/trans_presets.java:501
 msgid "aqueduct"
 msgstr "aquaduct"
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
-#: build/trans_presets.java:499
+#: build/trans_presets.java:512
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -21933 +22412 @@
 #. </optional>
 #. group "Ways"
-#: build/trans_presets.java:513
+#: build/trans_presets.java:527
 msgid "Ways"
 msgstr "Wegen"
 
 #. item "Ways/Track"
-#: build/trans_presets.java:514
+#: build/trans_presets.java:528
 msgid "Track"
 msgstr "Track"
@@ -21945 +22424 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
 #. item "Ways/Track" label "Edit Track"
-#: build/trans_presets.java:517
+#: build/trans_presets.java:531
 msgid "Edit Track"
 msgstr "Track bewerken"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "Tracktype"
 msgstr "Spoortype"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade1"
 msgstr "graad 1"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade2"
 msgstr "graad 2"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade3"
 msgstr "graad 3"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade4"
 msgstr "graad 4"
 
 #. item "Ways/Track" combo "Tracktype" display value
-#: build/trans_presets.java:522
+#: build/trans_presets.java:536
 msgid "grade5"
 msgstr "graad 5"
@@ -21981 +22460 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:524 build/trans_presets.java:554
+#: build/trans_presets.java:538 build/trans_presets.java:569
 msgid "MTB Scale"
 msgstr "MTB schaal"
 
 #. item "Ways/Track" combo "General access"
-#: build/trans_presets.java:532
+#: build/trans_presets.java:546
 msgid "General access"
 msgstr ""
@@ -21992 +22471 @@
 #. </optional>
 #. item "Ways/Path"
-#: build/trans_presets.java:539
+#: build/trans_presets.java:554
 msgid "Path"
 msgstr "Pad"
@@ -21999 +22478 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
 #. item "Ways/Path" label "Edit Path"
-#: build/trans_presets.java:542
+#: build/trans_presets.java:557
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "SAC Scale"
 msgstr "SAC schaal"
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T1 - hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T2 - mountain hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T3 - difficult, exposed hiking trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T4 - difficult, exposed, steep alpine trail"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T5 - difficult alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" display value
-#: build/trans_presets.java:547
+#: build/trans_presets.java:562
 msgid "T6 - hazardous alpine trail with climbing"
 msgstr ""
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
-#: build/trans_presets.java:548
+#: build/trans_presets.java:563
 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:549
+#: build/trans_presets.java:564
 msgid ""
 "Trail with continuous line and balanced ascent. Terrain partially steep, "
@@ -22051 +22530 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description
-#: build/trans_presets.java:550
+#: build/trans_presets.java:565
 msgid ""
 "exposed sites may be secured with ropes or chains, possible need to use "
@@ -22059 +22538 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description
-#: build/trans_presets.java:551
+#: build/trans_presets.java:566
 msgid ""
 "sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
@@ -22066 +22545 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description
-#: build/trans_presets.java:552
+#: build/trans_presets.java:567
 msgid ""
 "single plainly climbing up to second grade. Exposed, demanding terrain, "
@@ -22073 +22552 @@
 
 #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description
-#: build/trans_presets.java:553
+#: build/trans_presets.java:568
 msgid ""
 "climbing up to second grade. Often very exposed, precarious jagged rocks, "
@@ -22081 +22560 @@
 #. item "Ways/Path" combo "Visibility"
 #. visibilty
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125
 msgid "Visibility"
@@ -22087 +22566 @@
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "excellent"
 msgstr "uitstekend"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "good"
 msgstr "goed"
@@ -22098 +22577 @@
 #. item "Ways/Path" combo "Visibility" display value
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:556 build/trans_presets.java:2736
+#: build/trans_presets.java:571 build/trans_presets.java:2881
 msgid "intermediate"
 msgstr "gemiddeld"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "bad"
 msgstr "slecht"
 
 #. item "Ways/Path" combo "Visibility" display value
-#: build/trans_presets.java:556
+#: build/trans_presets.java:571
 msgid "horrible"
 msgstr "verschrikkelijk"
@@ -22129 +22608 @@
 #. item "Food+Drinks/Bar" combo "Wheelchairs"
 #. item "Food+Drinks/Nightclub" combo "Wheelchairs"
-#: build/trans_presets.java:566 build/trans_presets.java:1809
-#: build/trans_presets.java:1827 build/trans_presets.java:1843
-#: build/trans_presets.java:1860 build/trans_presets.java:1878
-#: build/trans_presets.java:1895 build/trans_presets.java:1912
-#: build/trans_presets.java:1934 build/trans_presets.java:1957
-#: build/trans_presets.java:1976 build/trans_presets.java:1993
-#: build/trans_presets.java:2012 build/trans_presets.java:2031
-#: build/trans_presets.java:2047 build/trans_presets.java:2064
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:581 build/trans_presets.java:1943
+#: build/trans_presets.java:1961 build/trans_presets.java:1977
+#: build/trans_presets.java:1994 build/trans_presets.java:2012
+#: build/trans_presets.java:2029 build/trans_presets.java:2046
+#: build/trans_presets.java:2068 build/trans_presets.java:2091
+#: build/trans_presets.java:2110 build/trans_presets.java:2127
+#: build/trans_presets.java:2146 build/trans_presets.java:2165
+#: build/trans_presets.java:2181 build/trans_presets.java:2198
+#: build/trans_presets.java:2213
 msgid "Wheelchairs"
 msgstr "Rolstoelen"
 
 #. item "Ways/Path" combo "Ski"
-#: build/trans_presets.java:567
+#: build/trans_presets.java:582
 msgid "Ski"
 msgstr "Ski"
 
 #. item "Ways/Path" combo "Snowmobile"
-#: build/trans_presets.java:568
+#: build/trans_presets.java:583
 msgid "Snowmobile"
 msgstr "Sneeuwscooter"
@@ -22154 +22633 @@
 #. <separator/>
 #. item "Ways/Dedicated Bridleway"
-#: build/trans_presets.java:576
+#: build/trans_presets.java:592
 msgid "Dedicated Bridleway"
 msgstr "Voorbestemd Ruiterpad"
@@ -22160 +22639 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
 #. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
-#: build/trans_presets.java:578
+#: build/trans_presets.java:594
 msgid "Edit Bridleway"
 msgstr "Ruiterpad bewerken"
@@ -22166 +22645 @@
 #. </optional>
 #. item "Ways/Dedicated Cycleway"
-#: build/trans_presets.java:595
+#: build/trans_presets.java:612
 msgid "Dedicated Cycleway"
 msgstr "Voorbestemd Fietspad"
@@ -22182 +22661 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
 #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
-#: build/trans_presets.java:599 build/trans_presets.java:620
-#: build/trans_presets.java:643
+#: build/trans_presets.java:616 build/trans_presets.java:638
+#: build/trans_presets.java:662
 msgid "Edit Cycleway"
 msgstr "Fietspad bewerken"
 
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: build/trans_presets.java:611
+#: build/trans_presets.java:628
 msgid "Pedestrians"
 msgstr "Voetgangers"
@@ -22194 +22673 @@
 #. </optional>
 #. item "Ways/Segregated Foot- and Cycleway"
-#: build/trans_presets.java:616
+#: build/trans_presets.java:634
 msgid "Segregated Foot- and Cycleway"
 msgstr "Gescheiden Voet- en Fietspad"
@@ -22200 +22679 @@
 #. </optional>
 #. item "Ways/Combined Foot- and Cycleway"
-#: build/trans_presets.java:639
+#: build/trans_presets.java:658
 msgid "Combined Foot- and Cycleway"
 msgstr "Gekombineerd Voet- en Fietspad"
@@ -22206 +22685 @@
 #. </optional>
 #. item "Ways/Dedicated Footway"
-#: build/trans_presets.java:663
+#: build/trans_presets.java:683
 msgid "Dedicated Footway"
 msgstr "Voorbestemd Voetpad"
@@ -22213 +22692 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
 #. item "Ways/Dedicated Footway" label "Edit Footway"
-#: build/trans_presets.java:666
+#: build/trans_presets.java:686
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
@@ -22219 +22698 @@
 #. </optional>
 #. item "Ways/Steps"
-#: build/trans_presets.java:682
+#: build/trans_presets.java:703
 msgid "Steps"
 msgstr "Trap"
@@ -22227 +22706 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
 #. item "Ways/Steps" label "Edit Flight of Steps"
-#: build/trans_presets.java:686
+#: build/trans_presets.java:707
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
 
 #. item "Ways/Steps" text "Amount of Steps"
-#: build/trans_presets.java:700
+#: build/trans_presets.java:721
 msgid "Amount of Steps"
 msgstr "Aantal trappen"
@@ -22238 +22717 @@
 #. </optional>
 #. group "Waypoints"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:725
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91
 msgid "Waypoints"
@@ -22244 +22723 @@
 
 #. item "Waypoints/Motorway Junction"
-#: build/trans_presets.java:705
+#: build/trans_presets.java:726
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -22250 +22729 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
 #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
-#: build/trans_presets.java:707
+#: build/trans_presets.java:728
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:711
+#: build/trans_presets.java:732
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -22262 +22741 @@
 
 #. item "Waypoints/Motorway Junction" text "Exit to"
-#: build/trans_presets.java:712
+#: build/trans_presets.java:733
 msgid "Exit to"
 msgstr ""
 
 #. item "Waypoints/Services"
-#: build/trans_presets.java:714
+#: build/trans_presets.java:735
 msgid "Services"
 msgstr "Diensten"
@@ -22273 +22752 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
 #. item "Waypoints/Services" label "Edit Service Station"
-#: build/trans_presets.java:716
+#: build/trans_presets.java:737
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -22305 +22784 @@
 #. item "Public Building/Post Office" text "Operator"
 #. item "Education/Driving School" text "Operator"
+#. item "Health/Nursing Home" text "Operator"
 #. item "Health/Hearing Aids" text "Operator"
 #. <key key="amenity" value="baby_hatch" />
@@ -22361 +22841 @@
 #. item "Land use/Garages" text "Operator"
 #. item "Relations/Route" text "Operator"
+#. item "Relations/Directional Route (North America)" text "Operator"
 #. item "Relations/Route network" text "Operator"
-#: build/trans_presets.java:721 build/trans_presets.java:888
-#: build/trans_presets.java:1466 build/trans_presets.java:1490
-#: build/trans_presets.java:1499 build/trans_presets.java:1508
-#: build/trans_presets.java:1515 build/trans_presets.java:1523
-#: build/trans_presets.java:1539 build/trans_presets.java:1548
-#: build/trans_presets.java:1567 build/trans_presets.java:1706
-#: build/trans_presets.java:1803 build/trans_presets.java:1821
-#: build/trans_presets.java:1872 build/trans_presets.java:1889
-#: build/trans_presets.java:1948 build/trans_presets.java:1969
-#: build/trans_presets.java:2005 build/trans_presets.java:2024
-#: build/trans_presets.java:2155 build/trans_presets.java:2165
-#: build/trans_presets.java:2226 build/trans_presets.java:2311
-#: build/trans_presets.java:2336 build/trans_presets.java:2379
-#: build/trans_presets.java:2412 build/trans_presets.java:2444
-#: build/trans_presets.java:2457 build/trans_presets.java:2468
-#: build/trans_presets.java:2487 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2586
-#: build/trans_presets.java:2808 build/trans_presets.java:2817
-#: build/trans_presets.java:2939 build/trans_presets.java:2958
-#: build/trans_presets.java:2977 build/trans_presets.java:2995
-#: build/trans_presets.java:3006 build/trans_presets.java:3022
-#: build/trans_presets.java:3078 build/trans_presets.java:3114
-#: build/trans_presets.java:3122 build/trans_presets.java:3130
-#: build/trans_presets.java:3155 build/trans_presets.java:3270
-#: build/trans_presets.java:3279 build/trans_presets.java:3296
-#: build/trans_presets.java:3305 build/trans_presets.java:3342
-#: build/trans_presets.java:3391 build/trans_presets.java:3414
-#: build/trans_presets.java:3423 build/trans_presets.java:3445
-#: build/trans_presets.java:3460 build/trans_presets.java:3470
-#: build/trans_presets.java:3479 build/trans_presets.java:3507
-#: build/trans_presets.java:3516 build/trans_presets.java:3555
-#: build/trans_presets.java:3571 build/trans_presets.java:3580
-#: build/trans_presets.java:3589 build/trans_presets.java:3605
-#: build/trans_presets.java:3627 build/trans_presets.java:3642
-#: build/trans_presets.java:3651 build/trans_presets.java:3919
-#: build/trans_presets.java:4012 build/trans_presets.java:4156
-#: build/trans_presets.java:4176
+#: build/trans_presets.java:742 build/trans_presets.java:915
+#: build/trans_presets.java:1600 build/trans_presets.java:1624
+#: build/trans_presets.java:1633 build/trans_presets.java:1642
+#: build/trans_presets.java:1649 build/trans_presets.java:1657
+#: build/trans_presets.java:1673 build/trans_presets.java:1682
+#: build/trans_presets.java:1701 build/trans_presets.java:1840
+#: build/trans_presets.java:1937 build/trans_presets.java:1955
+#: build/trans_presets.java:2006 build/trans_presets.java:2023
+#: build/trans_presets.java:2082 build/trans_presets.java:2103
+#: build/trans_presets.java:2139 build/trans_presets.java:2158
+#: build/trans_presets.java:2289 build/trans_presets.java:2299
+#: build/trans_presets.java:2360 build/trans_presets.java:2446
+#: build/trans_presets.java:2471 build/trans_presets.java:2514
+#: build/trans_presets.java:2547 build/trans_presets.java:2575
+#: build/trans_presets.java:2592 build/trans_presets.java:2600
+#: build/trans_presets.java:2612 build/trans_presets.java:2632
+#: build/trans_presets.java:2641 build/trans_presets.java:2648
+#: build/trans_presets.java:2731 build/trans_presets.java:2953
+#: build/trans_presets.java:2962 build/trans_presets.java:3084
+#: build/trans_presets.java:3103 build/trans_presets.java:3122
+#: build/trans_presets.java:3140 build/trans_presets.java:3151
+#: build/trans_presets.java:3167 build/trans_presets.java:3223
+#: build/trans_presets.java:3270 build/trans_presets.java:3278
+#: build/trans_presets.java:3286 build/trans_presets.java:3311
+#: build/trans_presets.java:3426 build/trans_presets.java:3435
+#: build/trans_presets.java:3452 build/trans_presets.java:3461
+#: build/trans_presets.java:3498 build/trans_presets.java:3547
+#: build/trans_presets.java:3570 build/trans_presets.java:3579
+#: build/trans_presets.java:3601 build/trans_presets.java:3616
+#: build/trans_presets.java:3626 build/trans_presets.java:3635
+#: build/trans_presets.java:3663 build/trans_presets.java:3672
+#: build/trans_presets.java:3711 build/trans_presets.java:3727
+#: build/trans_presets.java:3736 build/trans_presets.java:3745
+#: build/trans_presets.java:3761 build/trans_presets.java:3783
+#: build/trans_presets.java:3798 build/trans_presets.java:3807
+#: build/trans_presets.java:4082 build/trans_presets.java:4175
+#: build/trans_presets.java:4324 build/trans_presets.java:4354
+#: build/trans_presets.java:4376
 msgid "Operator"
 msgstr "Bedrijf"
@@ -22405 +22887 @@
 #. item "Waypoints/Rest Area" check "Toilets"
 #. item "Facilities/Toilets"
-#: build/trans_presets.java:722 build/trans_presets.java:732
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:743 build/trans_presets.java:753
+#: build/trans_presets.java:2628
 msgid "Toilets"
 msgstr "Toiletten"
@@ -22412 +22894 @@
 #. </optional>
 #. item "Waypoints/Rest Area"
-#: build/trans_presets.java:725
+#: build/trans_presets.java:746
 msgid "Rest Area"
 msgstr "Rustplaats"
@@ -22418 +22900 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area" />
 #. item "Waypoints/Rest Area" label "Edit Rest Area"
-#: build/trans_presets.java:727
+#: build/trans_presets.java:748
 msgid "Edit Rest Area"
 msgstr "Wijzig Rustplaats"
@@ -22424 +22906 @@
 #. </optional>
 #. item "Waypoints/Emergency Phone"
-#: build/trans_presets.java:735
+#: build/trans_presets.java:756
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -22432 +22914 @@
 #. <separator/>
 #. item "Waypoints/Traffic Signal"
-#: build/trans_presets.java:740
+#: build/trans_presets.java:761
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -22440 +22922 @@
 #. <optional>
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
-#: build/trans_presets.java:744
+#: build/trans_presets.java:765
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -22447 +22929 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
@@ -22455 +22937 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "traffic_signals"
 msgstr "verkeerslichten"
@@ -22463 +22945 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "island"
 msgstr "eiland"
@@ -22471 +22953 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type" display value
 #. item "Transport/Railway/Crossing" combo "Crossing type" display value
-#: build/trans_presets.java:744 build/trans_presets.java:766
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:765 build/trans_presets.java:787
+#: build/trans_presets.java:1412
 msgid "unmarked"
 msgstr "ongemarkeerd"
@@ -22479 +22961 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:745 build/trans_presets.java:768
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:766 build/trans_presets.java:789
+#: build/trans_presets.java:1413
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -22487 +22969 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:746 build/trans_presets.java:767
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:767 build/trans_presets.java:788
+#: build/trans_presets.java:1414
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -22495 +22977 @@
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
-#: build/trans_presets.java:747 build/trans_presets.java:769
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:768 build/trans_presets.java:790
+#: build/trans_presets.java:1415
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
-#: build/trans_presets.java:748
+#: build/trans_presets.java:769
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -22507 +22989 @@
 #. 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:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "zebra"
 msgstr "zebra"
@@ -22513 +22995 @@
 #. 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:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "pelican"
 msgstr "pelicaan"
@@ -22519 +23001 @@
 #. 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:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "toucan"
 msgstr ""
@@ -22525 +23007 @@
 #. 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:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "puffin"
 msgstr ""
@@ -22531 +23013 @@
 #. 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:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "pegasus"
 msgstr ""
@@ -22537 +23019 @@
 #. 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:748 build/trans_presets.java:770
+#: build/trans_presets.java:769 build/trans_presets.java:791
 msgid "tiger"
 msgstr ""
@@ -22543 +23025 @@
 #. </optional>
 #. item "Waypoints/Stop"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:772
 msgid "Stop"
 msgstr "Stop"
@@ -22549 +23031 @@
 #. <key key="highway" value="stop" />
 #. item "Waypoints/Mini-roundabout"
-#: build/trans_presets.java:754
+#: build/trans_presets.java:775
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -22558 +23040 @@
 #. <key key="highway" value="mini_roundabout" />
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:759
+#: build/trans_presets.java:780
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction" display value
-#: build/trans_presets.java:759
+#: build/trans_presets.java:780
 msgid "clockwise"
 msgstr "met de klok mee"
 
 #. item "Waypoints/Pedestrian Crossing"
-#: build/trans_presets.java:761
+#: build/trans_presets.java:782
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -22575 +23057 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#: build/trans_presets.java:764
+#: build/trans_presets.java:785
 msgid "Edit Crossing"
 msgstr "Wijzig Oversteekplaats"
 
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:791
 msgid "Type name (UK)"
 msgstr ""
 
 #. item "Waypoints/Traffic Calming"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:793
 msgid "Traffic Calming"
 msgstr "Verkeersremmers"
@@ -22591 +23073 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
 #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
-#: build/trans_presets.java:774
+#: build/trans_presets.java:795
 msgid "Edit Traffic Calming"
 msgstr "Wijzig verkeersremmers"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "bump"
 msgstr "ribbel"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "chicane"
 msgstr "asverschuiving"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "choker"
 msgstr "versmalling"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "cushion"
 msgstr "Verkeerskussen"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "hump"
 msgstr "verkeersdrempel"
 
 #. item "Waypoints/Traffic Calming" combo "Type" display value
-#: build/trans_presets.java:775
+#: build/trans_presets.java:796
 msgid "table"
 msgstr "verkeersplateau"
 
 #. item "Waypoints/Passing Place"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:798
 msgid "Passing Place"
 msgstr "Uitwijkplaats"
@@ -22632 +23114 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:800
 msgid "Edit Passing Place"
 msgstr "Wijzig Uitwijkplaats"
@@ -22638 +23120 @@
 #. <key key="highway" value="passing_place" />
 #. item "Waypoints/Turning Circle"
-#: build/trans_presets.java:782
+#: build/trans_presets.java:803
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -22646 +23128 @@
 #. <key key="highway" value="turning_circle" />
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:808
 msgid "City Limit"
 msgstr "Stadsgrens"
@@ -22652 +23134 @@
 #. <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:789
+#: build/trans_presets.java:810
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:815
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/Speed Camera"
-#: build/trans_presets.java:796
+#: build/trans_presets.java:817
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
@@ -22669 +23151 @@
 #. <key key="highway" value="speed_camera" />
 #. <separator/>
-#. item "Waypoints/Incline"
-#: build/trans_presets.java:801
-msgid "Incline"
-msgstr "Helling"
-
-#. <key key="highway" value="incline" />
-#. item "Waypoints/Incline Steep"
-#: build/trans_presets.java:804
-msgid "Incline Steep"
-msgstr "Steile Helling"
-
-#. <key key="highway" value="incline_steep" />
 #. item "Waypoints/Grit Bin"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:822
 msgid "Grit Bin"
 msgstr "Strooigoedbak"
@@ -22690 +23160 @@
 #. <separator/>
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:827
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item "Waypoints/Ford" label "Edit Ford"
-#: build/trans_presets.java:813
+#: build/trans_presets.java:828
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -22701 +23171 @@
 #. </optional>
 #. item "Waypoints/Mountain Pass"
-#: build/trans_presets.java:820
+#: build/trans_presets.java:835
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -22707 +23177 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
-#: build/trans_presets.java:822
+#: build/trans_presets.java:837
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -22717 +23187 @@
 #. item "Geography/Glacier" text "Elevation"
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:827 build/trans_presets.java:1890
-#: build/trans_presets.java:2139 build/trans_presets.java:3785
-#: build/trans_presets.java:3793 build/trans_presets.java:3801
+#: build/trans_presets.java:842 build/trans_presets.java:2024
+#: build/trans_presets.java:2273 build/trans_presets.java:3948
+#: build/trans_presets.java:3956 build/trans_presets.java:3964
 msgid "Elevation"
 msgstr "Stijging"
@@ -22742 +23212 @@
 #. item "Places/Village" text "Wikipedia"
 #. item "Places/Hamlet" text "Wikipedia"
+#. item "Places/Isolated Dwelling" text "Wikipedia"
 #. item "Places/Locality" text "Wikipedia"
 #. item "Geography/Peak" text "Wikipedia"
@@ -22751 +23222 @@
 #. <space />
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:828 build/trans_presets.java:1066
-#: build/trans_presets.java:1077 build/trans_presets.java:1091
-#: build/trans_presets.java:1106 build/trans_presets.java:1732
-#: build/trans_presets.java:2194 build/trans_presets.java:2265
-#: build/trans_presets.java:3170 build/trans_presets.java:3701
-#: build/trans_presets.java:3708 build/trans_presets.java:3715
-#: build/trans_presets.java:3722 build/trans_presets.java:3729
-#: build/trans_presets.java:3737 build/trans_presets.java:3745
-#: build/trans_presets.java:3753 build/trans_presets.java:3760
-#: build/trans_presets.java:3767 build/trans_presets.java:3776
-#: build/trans_presets.java:3786 build/trans_presets.java:3794
-#: build/trans_presets.java:3802 build/trans_presets.java:3809
-#: build/trans_presets.java:3818 build/trans_presets.java:3826
-#: build/trans_presets.java:4091
+#: build/trans_presets.java:843 build/trans_presets.java:1099
+#: build/trans_presets.java:1110 build/trans_presets.java:1124
+#: build/trans_presets.java:1139 build/trans_presets.java:1866
+#: build/trans_presets.java:2328 build/trans_presets.java:2399
+#: build/trans_presets.java:3326 build/trans_presets.java:3857
+#: build/trans_presets.java:3864 build/trans_presets.java:3871
+#: build/trans_presets.java:3878 build/trans_presets.java:3885
+#: build/trans_presets.java:3893 build/trans_presets.java:3901
+#: build/trans_presets.java:3909 build/trans_presets.java:3916
+#: build/trans_presets.java:3923 build/trans_presets.java:3930
+#: build/trans_presets.java:3939 build/trans_presets.java:3949
+#: build/trans_presets.java:3957 build/trans_presets.java:3965
+#: build/trans_presets.java:3972 build/trans_presets.java:3981
+#: build/trans_presets.java:3989 build/trans_presets.java:4254
 msgid "Wikipedia"
 msgstr "Wikipedia"
@@ -22770 +23241 @@
 #. </optional>
 #. group "Barriers"
-#: build/trans_presets.java:832
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barrières"
@@ -22776 +23247 @@
 #. <!-- *** node barriers *** -->
 #. item "Barriers/Bollard"
-#: build/trans_presets.java:835
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -22782 +23253 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
 #. item "Barriers/Bollard" label "Edit Bollard"
-#: build/trans_presets.java:837
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -22789 +23260 @@
 #. <key key="barrier" value="bollard" />
 #. item "Barriers/Bollard" label "Allowed traffic:"
+#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#. item "Barriers/Cycle Barrier" label "Allowed traffic:"
+#. <key key="barrier" value="block" />
+#. item "Barriers/Block" label "Allowed traffic:"
 #. <space />
 #. <key key="barrier" value="cattle_grid" />
@@ -22825 +23301 @@
 #. <key key="barrier" value="sally_port" />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
-#: build/trans_presets.java:840 build/trans_presets.java:859
-#: build/trans_presets.java:873 build/trans_presets.java:895
-#: build/trans_presets.java:932 build/trans_presets.java:945
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1003 build/trans_presets.java:1012
-#: build/trans_presets.java:1021
+#: build/trans_presets.java:855 build/trans_presets.java:865
+#: build/trans_presets.java:874 build/trans_presets.java:886
+#: build/trans_presets.java:900 build/trans_presets.java:922
+#: build/trans_presets.java:965 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1014 build/trans_presets.java:1026
+#: build/trans_presets.java:1036 build/trans_presets.java:1045
+#: build/trans_presets.java:1054
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Cycle Barrier"
-#: build/trans_presets.java:847
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Fietsversperring"
 
-#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
 #. item "Barriers/Block"
-#: build/trans_presets.java:851
+#: build/trans_presets.java:872
 msgid "Block"
 msgstr "Blok"
 
-#. <key key="barrier" value="block" />
 #. item "Barriers/Cattle Grid"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:881
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -22855 +23329 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
-#: build/trans_presets.java:856
+#: build/trans_presets.java:883
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Bus Trap"
-#: build/trans_presets.java:866
+#: build/trans_presets.java:893
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -22866 +23340 @@
 #. <key key="barrier" value="bus_trap" />
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:869
+#: build/trans_presets.java:896
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item "Barriers/Spikes" label "Edit Spikes"
-#: build/trans_presets.java:870
+#: build/trans_presets.java:897
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Toll Booth"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:908
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -22882 +23356 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
-#: build/trans_presets.java:883
+#: build/trans_presets.java:910
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -22888 +23362 @@
 #. </optional>
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:891
+#: build/trans_presets.java:918
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item "Barriers/Border Control" label "Edit Border Control"
-#: build/trans_presets.java:892
+#: build/trans_presets.java:919
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -22900 +23374 @@
 #. <!-- *** linear barriers *** -->
 #. item "Barriers/Hedge"
-#: build/trans_presets.java:906
+#: build/trans_presets.java:933
 msgid "Hedge"
 msgstr "Haag"
@@ -22907 +23381 @@
 #. <key key="barrier" value="hedge" />
 #. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:910 build/trans_presets.java:912
+#: build/trans_presets.java:937
 msgid "Fence"
 msgstr "Hek"
 
-#. item "Barriers/Fence" combo "Fence" display value
-#. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:912 build/trans_presets.java:2203
-msgid "fence"
-msgstr "Afsluiting"
-
-#. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:912
-msgid "wood_fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#. item "Barriers/Wire Fence"
+#: build/trans_presets.java:941
+#, fuzzy
+msgid "Wire Fence"
+msgstr "Draadafsluiting"
+
+#. <key key="barrier" value="wire_fence" />
+#. item "Barriers/Wood Fence"
+#: build/trans_presets.java:944
+#, fuzzy
+msgid "Wood Fence"
 msgstr "Houten_afsluiting"
 
-#. item "Barriers/Fence" combo "Fence" display value
-#: build/trans_presets.java:912
-msgid "wire_fence"
-msgstr "Draadafsluiting"
-
+#. <key key="barrier" value="wood_fence" />
 #. item "Barriers/Wall"
-#: build/trans_presets.java:914
+#: build/trans_presets.java:947
 msgid "Wall"
 msgstr "Muur"
@@ -22936 +23408 @@
 #. <key key="barrier" value="wall" />
 #. item "Barriers/City Wall"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:950
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -22943 +23415 @@
 #. <key key="barrier" value="city_wall" />
 #. item "Barriers/Retaining Wall"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:954
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -22952 +23424 @@
 #. <!-- *** access *** -->
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:928
+#: build/trans_presets.java:961
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item "Barriers/Entrance" label "Edit Entrance"
-#: build/trans_presets.java:929
+#: build/trans_presets.java:962
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
 
 #. item "Barriers/Gate"
-#: build/trans_presets.java:940
+#: build/trans_presets.java:973
 msgid "Gate"
 msgstr "Poort"
@@ -22968 +23440 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
 #. item "Barriers/Gate" label "Edit Gate"
-#: build/trans_presets.java:942
+#: build/trans_presets.java:975
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:953
+#: build/trans_presets.java:986
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item "Barriers/Lift Gate" label "Edit Lift Gate"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:987
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:965
+#: build/trans_presets.java:998
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:999
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:977
+#: build/trans_presets.java:1010
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#: build/trans_presets.java:978
+#: build/trans_presets.java:1011
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1022
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#: build/trans_presets.java:990
+#: build/trans_presets.java:1023
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Stile"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1031
 msgid "Stile"
 msgstr "Overstap"
@@ -23019 +23491 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #. item "Barriers/Stile" label "Edit Stile"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:1033
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:1008
+#: build/trans_presets.java:1041
 msgid "Turnstile"
 msgstr "Draaipoort"
 
 #. item "Barriers/Turnstile" label "Edit Turnstile"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1042
 msgid "Edit Turnstile"
 msgstr "Wijzig Draaipoort"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:1017
+#: build/trans_presets.java:1050
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item "Barriers/Sally Port" label "Edit Sally Port"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1051
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -23047 +23519 @@
 #. <separator/>
 #. item "Water/Water/Water"
-#: build/trans_presets.java:1032 build/trans_presets.java:1033
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1065 build/trans_presets.java:1066
+#: build/trans_presets.java:1167
 msgid "Water"
 msgstr "Water"
@@ -23054 +23526 @@
 #. <separator/>
 #. item "Water/Water/Drain"
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1068
 msgid "Drain"
 msgstr "Afvoer"
@@ -23060 +23532 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
 #. item "Water/Water/Drain" label "Edit Drain"
-#: build/trans_presets.java:1037
+#: build/trans_presets.java:1070
 msgid "Edit Drain"
 msgstr "Afvoer bewerken"
 
 #. item "Water/Water/Ditch"
-#: build/trans_presets.java:1043
+#: build/trans_presets.java:1076
 msgid "Ditch"
 msgstr "Gracht"
@@ -23071 +23543 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
 #. item "Water/Water/Ditch" label "Edit Ditch"
-#: build/trans_presets.java:1045
+#: build/trans_presets.java:1078
 msgid "Edit Ditch"
 msgstr "Wijzig gracht"
 
 #. item "Water/Water/Stream"
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1084
 msgid "Stream"
 msgstr "Beek"
@@ -23082 +23554 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
 #. item "Water/Water/Stream" label "Edit Stream"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1086
 msgid "Edit Stream"
 msgstr "Wijzig Beek"
 
 #. item "Water/Water/Canal"
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1092
 msgid "Canal"
 msgstr "Kanaal"
@@ -23093 +23565 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
 #. item "Water/Water/Canal" label "Edit Canal"
-#: build/trans_presets.java:1061
+#: build/trans_presets.java:1094
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Water/River"
-#: build/trans_presets.java:1068
+#: build/trans_presets.java:1101
 msgid "River"
 msgstr "Rivier"
@@ -23106 +23578 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
 #. item "Water/Water/River" label "Edit River"
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1105
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -23112 +23584 @@
 #. <separator/>
 #. item "Water/Water/Spring"
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1113
 msgid "Spring"
 msgstr "Bron"
@@ -23118 +23590 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
 #. item "Water/Water/Spring" label "Edit Spring"
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1115
 msgid "Edit Spring"
 msgstr "Bron bewerken"
 
 #. item "Water/Water/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1119
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item "Water/Water/Waterfall" label "Edit Waterfall"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1120
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Water/Water/Weir"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1126
 msgid "Weir"
 msgstr "Stuw"
@@ -23139 +23611 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
 #. item "Water/Water/Weir" label "Edit Weir"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1128
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Water/Water/Dam"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1133
 msgid "Dam"
 msgstr "Dam"
@@ -23150 +23622 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
 #. item "Water/Water/Dam" label "Edit Dam"
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1135
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Water/Groyne"
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1141
 msgid "Groyne"
 msgstr "Krib"
@@ -23161 +23633 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne" />
 #. item "Water/Water/Groyne" label "Edit Groyne"
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1143
 msgid "Edit Groyne"
 msgstr "Wijzig Krib"
@@ -23169 +23641 @@
 #. <separator/>
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1148
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item "Water/Water/Basin" label "Edit Basin Landuse"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1149
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Water/Reservoir"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1154
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -23185 +23657 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
 #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1156
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1161
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
-#: build/trans_presets.java:1129
+#: build/trans_presets.java:1162
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -23201 +23673 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
 #. item "Water/Water/Water" label "Edit Water"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1169
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1140
+#: build/trans_presets.java:1173
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land" label "Edit Land"
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1174
 msgid "Edit Land"
 msgstr "Land bewerken"
 
 #. item "Water/Water/Coastline"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1178
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -23222 +23694 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
 #. item "Water/Water/Coastline" label "Edit Coastline"
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1180
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
 
 #. item "Water/Water/Riverbank"
-#: build/trans_presets.java:1151
+#: build/trans_presets.java:1184
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -23234 +23706 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
 #. item "Water/Water/Riverbank" label "Edit Riverbank"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1187
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
@@ -23240 +23712 @@
 #. <separator/>
 #. item "Water/Water/Wetland"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1192
 msgid "Wetland"
 msgstr "Drasland"
@@ -23249 +23721 @@
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
 #. item "Water/Water/Wetland" label "Edit Wetland"
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1197
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "swamp"
 msgstr "Moeras"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "bog"
 msgstr "veen"
@@ -23270 +23742 @@
 #. <icon src="misc/no_icon.png"/>
 #. color marsh
-#: build/trans_presets.java:1167 build/trans_style.java:2930
+#: build/trans_presets.java:1200 build/trans_style.java:2930
 msgid "marsh"
 msgstr "moeras"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "reedbed"
 msgstr "rietveld"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "tidalflat"
 msgstr "slik"
 
 #. item "Water/Water/Wetland" combo "Type" display value
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1200
 msgid "mangrove"
 msgstr "mangroven"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1202
 msgid "Mud"
 msgstr "Modder"
 
 #. item "Water/Water/Mud" label "Edit Mud"
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1203
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Water/Beach"
-#: build/trans_presets.java:1174
+#: build/trans_presets.java:1207
 msgid "Beach"
 msgstr "Strand"
@@ -23311 +23783 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
 #. item "Water/Water/Beach" label "Edit Beach"
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1209
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1213
 msgid "Bay"
 msgstr "Baai"
 
 #. item "Water/Water/Bay" label "Edit Bay"
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1214
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Water/Cliff"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1218
 msgid "Cliff"
 msgstr "Klif"
@@ -23332 +23804 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
 #. item "Water/Water/Cliff" label "Edit Cliff"
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1220
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. group "Shipping"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1225
 msgid "Shipping"
 msgstr "Scheepvaart"
 
 #. item "Shipping/Ferry Terminal"
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1226
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -23348 +23820 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
 #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1228
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "Cargo"
 msgstr "Lading"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "passengers"
 msgstr "pasagiers"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "vehicle"
 msgstr "voertuigen"
@@ -23369 +23841 @@
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 #. </rule>
@@ -23446 +23919 @@
 #. <condition k="cycleway" v="opposite"/>
 #. color bicycle
-#: build/trans_presets.java:1198 build/trans_presets.java:4149
-#: 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:1231 build/trans_presets.java:4317
+#: build/trans_presets.java:4347 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
 msgid "bicycle"
 msgstr "fiets"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "hgv"
 msgstr "zwaar vervoer"
 
 #. item "Shipping/Ferry Terminal" combo "Cargo" display value
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1231
 msgid "passengers;vehicle"
 msgstr "pasagiers;voertuigen"
 
 #. item "Shipping/Ferry Route"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1233
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -23473 +23946 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
 #. item "Shipping/Ferry Route" label "Edit Ferry"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1235
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -23480 +23953 @@
 #. <separator/>
 #. item "Shipping/Marina"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1243
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item "Shipping/Marina" label "Edit Marina"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1244
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Shipping/Pier"
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1248
 msgid "Pier"
 msgstr "Pier"
@@ -23496 +23969 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
 #. item "Shipping/Pier" label "Edit Pier"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1250
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Shipping/Lock Gate"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1254
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -23508 +23981 @@
 #. <key key="waterway" value="lock_gate" />
 #. item "Shipping/Turning Point"
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1258
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -23516 +23989 @@
 #. <separator/>
 #. item "Shipping/Slipway"
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1263
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -23524 +23997 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
 #. item "Shipping/Slipway" label "Edit Slipway"
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1267
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
 
 #. item "Shipping/Boatyard"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1271
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -23535 +24008 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
 #. item "Shipping/Boatyard" label "Edit Boatyard"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1273
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Shipping/Dock"
-#: build/trans_presets.java:1245
+#: build/trans_presets.java:1278
 msgid "Dock"
 msgstr "Dok"
@@ -23546 +24019 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
 #. item "Shipping/Dock" label "Edit Dock"
-#: build/trans_presets.java:1247
+#: build/trans_presets.java:1280
 msgid "Edit Dock"
 msgstr "Dok bewerken"
 
 #. group "Transport"
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1287
 msgid "Transport"
 msgstr "Vervoer"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1288
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. item "Transport/Railway/Rail"
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1289
 msgid "Rail"
 msgstr "Spoor"
@@ -23567 +24040 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
 #. item "Transport/Railway/Rail" label "Edit Rail"
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1291
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -23595 +24068 @@
 #. <optional>
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1262 build/trans_presets.java:1274
-#: build/trans_presets.java:1298 build/trans_presets.java:1310
-#: build/trans_presets.java:1322 build/trans_presets.java:1334
+#: build/trans_presets.java:1295 build/trans_presets.java:1307
+#: build/trans_presets.java:1331 build/trans_presets.java:1343
+#: build/trans_presets.java:1355 build/trans_presets.java:1367
 msgid "Gauge (mm)"
 msgstr ""
@@ -23611 +24084 @@
 #. item "Transport/Railway/Subway" combo "Types"
 #. item "Transport/Railway/Tram" combo "Types"
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1296 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
 msgid "Types"
 msgstr "Types"
@@ -23626 +24099 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1364
+#: build/trans_presets.java:1296 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:1398
 msgid "yard"
 msgstr "tuin"
@@ -23641 +24114 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1364
+#: build/trans_presets.java:1296 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:1398
 msgid "siding"
 msgstr "nevenweg"
@@ -23656 +24129 @@
 #. item "Transport/Railway/Tram" combo "Types" display value
 #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value
-#: build/trans_presets.java:1263 build/trans_presets.java:1275
-#: build/trans_presets.java:1287 build/trans_presets.java:1299
-#: build/trans_presets.java:1311 build/trans_presets.java:1323
-#: build/trans_presets.java:1335 build/trans_presets.java:1364
+#: build/trans_presets.java:1296 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:1398
 msgid "spur"
 msgstr "privéoprit"
@@ -23670 +24143 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1264 build/trans_presets.java:1276
-#: build/trans_presets.java:1288 build/trans_presets.java:1300
-#: build/trans_presets.java:1312 build/trans_presets.java:1324
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1297 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
 msgid "Electrified"
 msgstr "Elektrisch"
@@ -23684 +24157 @@
 #. item "Transport/Railway/Subway" combo "Electrified" display value
 #. item "Transport/Railway/Tram" combo "Electrified" display value
-#: build/trans_presets.java:1264 build/trans_presets.java:1276
-#: build/trans_presets.java:1288 build/trans_presets.java:1300
-#: build/trans_presets.java:1312 build/trans_presets.java:1324
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1297 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
 msgid "contact_line"
 msgstr ""
@@ -23746 +24219 @@
 #. <condition k="railway" v="funicular"/>
 #. color rail
-#: build/trans_presets.java:1264 build/trans_presets.java:1276
-#: build/trans_presets.java:1288 build/trans_presets.java:1300
-#: build/trans_presets.java:1312 build/trans_presets.java:1324
-#: build/trans_presets.java:1336 build/trans_style.java:595
+#: build/trans_presets.java:1297 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_style.java:595
 #: build/trans_style.java:958 build/trans_style.java:1008
 #: build/trans_style.java:1014 build/trans_style.java:1021
@@ -23769 +24242 @@
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
 #. item "Power/Power Line" combo "Voltage"
-#: build/trans_presets.java:1265 build/trans_presets.java:1277
-#: build/trans_presets.java:1289 build/trans_presets.java:1301
-#: build/trans_presets.java:1313 build/trans_presets.java:1325
-#: build/trans_presets.java:1337 build/trans_presets.java:1491
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:1298 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:1625
+#: build/trans_presets.java:3314
 msgid "Voltage"
 msgstr "Voltage"
@@ -23784 +24257 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1266 build/trans_presets.java:1278
-#: build/trans_presets.java:1290 build/trans_presets.java:1302
-#: build/trans_presets.java:1314 build/trans_presets.java:1326
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1299 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
 msgid "Frequency (Hz)"
 msgstr "Frekwentie (Hz)"
@@ -23798 +24271 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value
-#: build/trans_presets.java:1266 build/trans_presets.java:1278
-#: build/trans_presets.java:1290 build/trans_presets.java:1302
-#: build/trans_presets.java:1314 build/trans_presets.java:1326
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1299 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
 msgid "16.7"
 msgstr "16,7"
@@ -23807 +24280 @@
 #. </optional>
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1302
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1303
 msgid "Edit Narrow Gauge Rail"
 msgstr "Smalspoor bewerken"
@@ -23818 +24291 @@
 #. </optional>
 #. item "Transport/Railway/Monorail"
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1314
 msgid "Monorail"
 msgstr "Monorail"
@@ -23824 +24297 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1316
 msgid "Edit Monorail"
 msgstr "Monorail bewerken"
@@ -23830 +24303 @@
 #. </optional>
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1326
 msgid "Preserved"
 msgstr "Museumspoor"
 
 #. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1327
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
@@ -23841 +24314 @@
 #. </optional>
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1305
+#: build/trans_presets.java:1338
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1339
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
@@ -23852 +24325 @@
 #. </optional>
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1350
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway" label "Edit Subway"
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1351
 msgid "Edit Subway"
 msgstr "Metro bewerken"
@@ -23863 +24336 @@
 #. </optional>
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1329
+#: build/trans_presets.java:1362
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram" label "Edit Tram"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1363
 msgid "Edit Tram"
 msgstr "Tram bewerken"
@@ -23874 +24347 @@
 #. </optional>
 #. item "Transport/Railway/Bus Guideway"
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1374
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -23880 +24353 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1376
 msgid "Edit Bus Guideway"
 msgstr "Busbaan bewerken"
@@ -23887 +24360 @@
 #. <separator/>
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1394
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1395
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
@@ -23899 +24372 @@
 #. <key key="railway" value="disused" />
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1398
 msgid "Optional Types"
 msgstr "Optionele soorten"
 
 #. item "Transport/Railway/Abandoned Rail"
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1400
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -23911 +24384 @@
 #. <separator/>
 #. item "Transport/Railway/Level Crossing"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1404
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -23918 +24391 @@
 #. <key key="railway" value="level_crossing" />
 #. item "Transport/Railway/Crossing"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1408
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -23926 +24399 @@
 #. <optional>
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1412
 msgid "Crossing type"
 msgstr "Type oversteekplaats"
@@ -23932 +24405 @@
 #. </optional>
 #. item "Transport/Railway/Turntable"
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1418
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -23939 +24412 @@
 #. <key key="railway" value="turntable" />
 #. item "Transport/Railway/Buffer Stop"
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1422
 msgid "Buffer Stop"
 msgstr "Stootblok"
@@ -23946 +24419 @@
 #. <key key="railway" value="buffer_stop" />
 #. group "Aerialway"
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1427
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. item "Aerialway/Chair Lift"
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1428
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -23957 +24430 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
 #. item "Aerialway/Chair Lift" label "Edit Chair Lift"
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1430
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
+#. item "Aerialway/Chair Lift" text "Reference number"
+#. item "Aerialway/Drag Lift" text "Reference number"
+#. item "Aerialway/Cable Car" text "Reference number"
+#. item "Aerialway/Gondola" text "Reference number"
+#. item "Aerialway/Mixed Lift" text "Reference number"
+#. item "Aerialway/T-bar Lift" text "Reference number"
+#. item "Aerialway/J-bar Lift" text "Reference number"
+#. item "Aerialway/Platter Lift" text "Reference number"
+#. item "Aerialway/Rope Tow" text "Reference number"
+#. item "Aerialway/Magic Carpet" text "Reference number"
+#. item "Aerialway/Goods" text "Reference number"
+#. item "Car/Parking" text "Reference number"
+#. item "Tourism/Information Terminal" text "Reference number"
+#. item "Tourism/Audioguide" text "Reference number"
+#. item "Facilities/Toilets" text "Reference number"
+#. item "Vending machine" text "Reference number"
+#: build/trans_presets.java:1433 build/trans_presets.java:1447
+#: build/trans_presets.java:1458 build/trans_presets.java:1471
+#: build/trans_presets.java:1484 build/trans_presets.java:1498
+#: build/trans_presets.java:1509 build/trans_presets.java:1520
+#: build/trans_presets.java:1531 build/trans_presets.java:1542
+#: build/trans_presets.java:1552 build/trans_presets.java:1579
+#: build/trans_presets.java:2290 build/trans_presets.java:2300
+#: build/trans_presets.java:2633 build/trans_presets.java:3808
+msgid "Reference number"
+msgstr "Referentienummer"
+
+#. <optional>
+#. item "Aerialway/Chair Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Drag Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Cable Car" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Gondola" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Mixed Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/T-bar Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/J-bar Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Platter Lift" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Rope Tow" text "Number of people per hour"
+#. <optional>
+#. item "Aerialway/Magic Carpet" text "Number of people per hour"
+#: build/trans_presets.java:1435 build/trans_presets.java:1449
+#: build/trans_presets.java:1460 build/trans_presets.java:1473
+#: build/trans_presets.java:1486 build/trans_presets.java:1500
+#: build/trans_presets.java:1511 build/trans_presets.java:1522
+#: build/trans_presets.java:1533 build/trans_presets.java:1544
+#, fuzzy
+msgid "Number of people per hour"
+msgstr "Aantal plaatsen"
+
+#. item "Aerialway/Chair Lift" text "Number of people per chair"
+#: build/trans_presets.java:1436
+#, fuzzy
+msgid "Number of people per chair"
+msgstr "Aantal plaatsen"
+
+#. item "Aerialway/Chair Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Drag Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Cable Car" text "Typical journey time in minutes"
+#. item "Aerialway/Gondola" text "Typical journey time in minutes"
+#. item "Aerialway/Mixed Lift" text "Typical journey time in minutes"
+#. item "Aerialway/T-bar Lift" text "Typical journey time in minutes"
+#. item "Aerialway/J-bar Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Platter Lift" text "Typical journey time in minutes"
+#. item "Aerialway/Rope Tow" text "Typical journey time in minutes"
+#. item "Aerialway/Magic Carpet" text "Typical journey time in minutes"
+#. <optional>
+#. item "Aerialway/Goods" text "Typical journey time in minutes"
+#: build/trans_presets.java:1437 build/trans_presets.java:1450
+#: build/trans_presets.java:1462 build/trans_presets.java:1475
+#: build/trans_presets.java:1488 build/trans_presets.java:1501
+#: build/trans_presets.java:1512 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1545
+#: build/trans_presets.java:1554
+msgid "Typical journey time in minutes"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" check "Has bubble?"
+#. item "Aerialway/Mixed Lift" check "Has bubble?"
+#: build/trans_presets.java:1438 build/trans_presets.java:1489
+msgid "Has bubble?"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" check "Has heating?"
+#. item "Aerialway/Cable Car" check "Has heating?"
+#. item "Aerialway/Gondola" check "Has heating?"
+#. item "Aerialway/Mixed Lift" check "Has heating?"
+#: build/trans_presets.java:1439 build/trans_presets.java:1463
+#: build/trans_presets.java:1476 build/trans_presets.java:1490
+#, fuzzy
+msgid "Has heating?"
+msgstr "Schaatsen"
+
+#. </optional>
 #. item "Aerialway/Drag Lift"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1442
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -23968 +24541 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
 #. item "Aerialway/Drag Lift" label "Edit Drag Lift"
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1444
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
+#. </optional>
 #. item "Aerialway/Cable Car"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1453
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -23979 +24553 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1455
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
+#. item "Aerialway/Cable Car" text "Number of people per car"
+#: build/trans_presets.java:1461
+#, fuzzy
+msgid "Number of people per car"
+msgstr "Aantal plaatsen"
+
+#. </optional>
 #. item "Aerialway/Gondola"
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1466
 msgid "Gondola"
 msgstr ""
@@ -23990 +24571 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #. item "Aerialway/Gondola" label "Edit Gondola"
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1468
 msgid "Edit Gondola"
 msgstr ""
 
-#. <separator/>
-#. item "Aerialway/Station"
-#: build/trans_presets.java:1419
-msgctxt "aerialway"
-msgid "Station"
-msgstr ""
+#. item "Aerialway/Gondola" text "Number of people per gondola"
+#: build/trans_presets.java:1474
+msgid "Number of people per gondola"
+msgstr ""
+
+#. </optional>
+#. item "Aerialway/Mixed Lift"
+#: build/trans_presets.java:1479
+#, fuzzy
+msgid "Mixed Lift"
+msgstr "Stoeltjeslift"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#. item "Aerialway/Station" label "Edit Station"
-#: build/trans_presets.java:1421
-msgctxt "aerialway"
-msgid "Edit Station"
-msgstr ""
-
-#. item "Aerialway/Pylon"
-#: build/trans_presets.java:1425
-msgctxt "aerialway"
-msgid "Pylon"
-msgstr ""
+#. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)"
+#: build/trans_presets.java:1481
+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:1487
+msgid "Number of people per gondola/chair"
+msgstr ""
+
+#. </optional>
+#. item "Aerialway/T-bar Lift"
+#: build/trans_presets.java:1493
+#, fuzzy
+msgid "T-bar Lift"
+msgstr "Stoeltjeslift"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#. item "Aerialway/Pylon" label "Edit Pylon"
-#: build/trans_presets.java:1427
-msgctxt "aerialway"
-msgid "Edit Pylon"
-msgstr ""
-
+#. item "Aerialway/T-bar Lift" label "Edit T-bar Lift"
+#: build/trans_presets.java:1495
+#, fuzzy
+msgid "Edit T-bar Lift"
+msgstr "Stoeltjeslift bewerken"
+
+#. </optional>
+#. item "Aerialway/J-bar Lift"
+#: build/trans_presets.java:1504
+#, fuzzy
+msgid "J-bar Lift"
+msgstr "Stoeltjeslift"
+
+#. <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:1506
+#, fuzzy
+msgid "Edit J-bar Lift"
+msgstr "Stoeltjeslift bewerken"
+
+#. </optional>
+#. item "Aerialway/Platter Lift"
+#: build/trans_presets.java:1515
+#, fuzzy
+msgid "Platter Lift"
+msgstr "Stoeltjeslift"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Platter Lift" label "Edit Platter Lift"
+#: build/trans_presets.java:1517
+#, fuzzy
+msgid "Edit Platter Lift"
+msgstr "Stoeltjeslift bewerken"
+
+#. </optional>
+#. item "Aerialway/Rope Tow"
+#: build/trans_presets.java:1526
+#, fuzzy
+msgid "Rope Tow"
+msgstr "Hoogspanningsmast"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Rope Tow" label "Edit Rope Tow"
+#: build/trans_presets.java:1528
+#, fuzzy
+msgid "Edit Rope Tow"
+msgstr "Hoogspanningsmast bewerken"
+
+#. </optional>
+#. item "Aerialway/Magic Carpet"
+#: build/trans_presets.java:1537
+msgid "Magic Carpet"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Magic Carpet" label "Edit Magic Carpet"
+#: build/trans_presets.java:1539
+#, fuzzy
+msgid "Edit Magic Carpet"
+msgstr "Kabinebaan bewerken"
+
+#. </optional>
 #. item "Aerialway/Goods"
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1548
 msgctxt "aerialway"
 msgid "Goods"
@@ -24028 +24675 @@
 
 #. item "Aerialway/Goods" label "Edit Goods"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1549
 msgctxt "aerialway"
 msgid "Edit Goods"
 msgstr "Wijzig Goederen"
+
+#. </optional>
+#. <separator/>
+#. item "Aerialway/Station"
+#: build/trans_presets.java:1558
+msgctxt "aerialway"
+msgid "Station"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Station" label "Edit Station"
+#: build/trans_presets.java:1560
+msgctxt "aerialway"
+msgid "Edit Station"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#: build/trans_presets.java:1564
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#: build/trans_presets.java:1566
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
 
 #. item "Car/Parking"
@@ -24044 +24719 @@
 #. </button>
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
-#: build/trans_presets.java:1439 build/trans_presets.java:1553
-#: build/trans_presets.java:1585 build/trans_surveyor.java:24
+#: build/trans_presets.java:1573 build/trans_presets.java:1687
+#: build/trans_presets.java:1719 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parkeerplaats"
@@ -24052 +24727 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
 #. item "Car/Parking" label "Edit Parking"
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1576
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
 
-#. item "Car/Parking" text "Reference number"
-#. item "Tourism/Information Terminal" text "Reference number"
-#. item "Tourism/Audioguide" text "Reference number"
-#. item "Facilities/Toilets" text "Reference number"
-#. item "Vending machine" text "Reference number"
-#: build/trans_presets.java:1445 build/trans_presets.java:2156
-#: build/trans_presets.java:2166 build/trans_presets.java:2488
-#: build/trans_presets.java:3652
-msgid "Reference number"
-msgstr "Referentienummer"
-
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1446 build/trans_presets.java:1558
+#: build/trans_presets.java:1580 build/trans_presets.java:1692
 msgid "multi-storey"
 msgstr "meerlaags"
@@ -24075 +24739 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1446 build/trans_presets.java:1558
+#: build/trans_presets.java:1580 build/trans_presets.java:1692
 msgid "surface"
 msgstr "oppervlak"
@@ -24081 +24745 @@
 #. item "Car/Parking" combo "Type" display value
 #. item "Motorcycle/Parking" combo "Type" display value
-#: build/trans_presets.java:1446 build/trans_presets.java:1558
+#: build/trans_presets.java:1580 build/trans_presets.java:1692
 msgid "underground"
 msgstr "ondergronds"
 
 #. item "Car/Parking" combo "Park and Ride"
-#: build/trans_presets.java:1447
+#: build/trans_presets.java:1581
 msgid "Park and Ride"
 msgstr "PR (Park en Ride)"
@@ -24095 +24759 @@
 #. item "Tourism/Audioguide" combo "Fee"
 #. item "Facilities/Toilets" combo "Fee"
-#: build/trans_presets.java:1448 build/trans_presets.java:1559
-#: build/trans_presets.java:2157 build/trans_presets.java:2167
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:1582 build/trans_presets.java:1693
+#: build/trans_presets.java:2291 build/trans_presets.java:2301
+#: build/trans_presets.java:2634
 msgid "Fee"
 msgstr "Parkeergeld"
@@ -24103 +24767 @@
 #. <space />
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1584
 msgid "Capacity (overall)"
 msgstr "Plaatsen (totaal)"
 
 #. item "Car/Parking" combo "Spaces for Disabled"
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1585
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
 #. item "Car/Parking" combo "Spaces for Women"
-#: build/trans_presets.java:1452
+#: build/trans_presets.java:1586
 msgid "Spaces for Women"
 msgstr "Plaatsen voor vrouwen"
 
 #. item "Car/Parking" combo "Spaces for Parents"
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1587
 msgid "Spaces for Parents"
 msgstr "Plaatsen voor ouders"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1588
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Zie de Wiki voor andere capacity:[types]=*."
@@ -24129 +24793 @@
 #. <separator/>
 #. item "Car/Fuel"
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1591
 msgid "Fuel"
 msgstr "Brandstof"
@@ -24137 +24801 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
 #. item "Car/Fuel" label "Edit Fuel"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1595
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
@@ -24149 +24813 @@
 #. item "Car/Sharing" text "Brand"
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1463 build/trans_presets.java:1498
-#: build/trans_presets.java:1514 build/trans_presets.java:1522
-#: build/trans_presets.java:1538 build/trans_presets.java:1547
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1597 build/trans_presets.java:1632
+#: build/trans_presets.java:1648 build/trans_presets.java:1656
+#: build/trans_presets.java:1672 build/trans_presets.java:1681
+#: build/trans_presets.java:1700
 msgid "Brand"
 msgstr "Merk"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Agip"
 msgstr "Agip"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Aral"
 msgstr "Aral"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Avia"
 msgstr "Avia"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "BP"
 msgstr "BP"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Chevron"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Citgo"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Esso"
 msgstr "Esso"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Exxon"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Gulf"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Mobil"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "OMV"
 msgstr "OMV"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Petro-Canada"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Pioneer"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Q8"
 msgstr "Q8"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Repsol"
 msgstr "Repsol"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Shell"
 msgstr "Shell"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Sunoco"
 msgstr ""
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Statoil"
 msgstr "Statoil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Tamoil"
 msgstr "Tamoil"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Texaco"
 msgstr "Texaco"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Total"
 msgstr "Total"
 
 #. item "Car/Fuel" combo "Brand" display value
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1597
 msgid "Independent"
 msgstr "Onafhankelijk"
@@ -24289 +24953 @@
 #. item "Culture/Museum" combo "Opening Hours"
 #. item "Culture/Library" combo "Opening Hours"
-#. item "Culture/Place of Worship" combo "Opening Hours"
 #. item "Public Building/Community Centre" combo "Opening Hours"
 #. item "Health/Doctors" combo "Opening Hours"
@@ -24354 +25017 @@
 #. item "Other/Toys" combo "Opening Hours"
 #. item "Other/Variety Store" combo "Opening Hours"
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2092
-#: build/trans_presets.java:2107 build/trans_presets.java:2193
-#: build/trans_presets.java:2204 build/trans_presets.java:2211
-#: build/trans_presets.java:2227 build/trans_presets.java:2264
-#: build/trans_presets.java:2280 build/trans_presets.java:2303
-#: build/trans_presets.java:2337 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2445 build/trans_presets.java:2458
-#: build/trans_presets.java:2479 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:3176
-#: build/trans_presets.java:3184 build/trans_presets.java:3233
-#: build/trans_presets.java:3240 build/trans_presets.java:3247
-#: build/trans_presets.java:3255 build/trans_presets.java:3262
-#: build/trans_presets.java:3271 build/trans_presets.java:3280
-#: build/trans_presets.java:3287 build/trans_presets.java:3297
-#: build/trans_presets.java:3306 build/trans_presets.java:3312
-#: build/trans_presets.java:3320 build/trans_presets.java:3326
-#: build/trans_presets.java:3334 build/trans_presets.java:3343
-#: build/trans_presets.java:3349 build/trans_presets.java:3356
-#: build/trans_presets.java:3362 build/trans_presets.java:3370
-#: build/trans_presets.java:3377 build/trans_presets.java:3383
-#: build/trans_presets.java:3392 build/trans_presets.java:3400
-#: build/trans_presets.java:3406 build/trans_presets.java:3415
-#: build/trans_presets.java:3424 build/trans_presets.java:3430
-#: build/trans_presets.java:3436 build/trans_presets.java:3446
-#: build/trans_presets.java:3454 build/trans_presets.java:3471
-#: build/trans_presets.java:3480 build/trans_presets.java:3487
-#: build/trans_presets.java:3493 build/trans_presets.java:3499
-#: build/trans_presets.java:3508 build/trans_presets.java:3517
-#: build/trans_presets.java:3525 build/trans_presets.java:3532
-#: build/trans_presets.java:3540 build/trans_presets.java:3547
-#: build/trans_presets.java:3556 build/trans_presets.java:3563
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3590 build/trans_presets.java:3597
-#: build/trans_presets.java:3606 build/trans_presets.java:3612
-#: build/trans_presets.java:3619 build/trans_presets.java:3628
-#: build/trans_presets.java:3634 build/trans_presets.java:3643
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2226
+#: build/trans_presets.java:2241 build/trans_presets.java:2327
+#: build/trans_presets.java:2338 build/trans_presets.java:2345
+#: build/trans_presets.java:2361 build/trans_presets.java:2398
+#: build/trans_presets.java:2414 build/trans_presets.java:2472
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2584 build/trans_presets.java:2593
+#: build/trans_presets.java:2601 build/trans_presets.java:2624
+#: build/trans_presets.java:2781 build/trans_presets.java:2787
+#: build/trans_presets.java:3332 build/trans_presets.java:3340
+#: build/trans_presets.java:3389 build/trans_presets.java:3396
+#: build/trans_presets.java:3403 build/trans_presets.java:3411
+#: build/trans_presets.java:3418 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3443
+#: build/trans_presets.java:3453 build/trans_presets.java:3462
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:3512 build/trans_presets.java:3518
+#: build/trans_presets.java:3526 build/trans_presets.java:3533
+#: build/trans_presets.java:3539 build/trans_presets.java:3548
+#: build/trans_presets.java:3556 build/trans_presets.java:3562
+#: build/trans_presets.java:3571 build/trans_presets.java:3580
+#: build/trans_presets.java:3586 build/trans_presets.java:3592
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3627 build/trans_presets.java:3636
+#: build/trans_presets.java:3643 build/trans_presets.java:3649
+#: build/trans_presets.java:3655 build/trans_presets.java:3664
+#: build/trans_presets.java:3673 build/trans_presets.java:3681
+#: build/trans_presets.java:3688 build/trans_presets.java:3696
+#: build/trans_presets.java:3703 build/trans_presets.java:3712
+#: build/trans_presets.java:3719 build/trans_presets.java:3728
+#: build/trans_presets.java:3737 build/trans_presets.java:3746
+#: build/trans_presets.java:3753 build/trans_presets.java:3762
+#: build/trans_presets.java:3768 build/trans_presets.java:3775
+#: build/trans_presets.java:3784 build/trans_presets.java:3790
+#: build/trans_presets.java:3799
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -24422 +25085 @@
 #. item "Culture/Museum" combo "Opening Hours" display value
 #. item "Culture/Library" combo "Opening Hours" display value
-#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting" display value
 #. item "Public Building/Community Centre" combo "Opening Hours" display value
 #. item "Health/Doctors" combo "Opening Hours" display value
@@ -24486 +25149 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2107
-#: build/trans_presets.java:2193 build/trans_presets.java:2204
-#: build/trans_presets.java:2211 build/trans_presets.java:2264
-#: build/trans_presets.java:2280 build/trans_presets.java:2303
-#: build/trans_presets.java:2337 build/trans_presets.java:2422
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2445 build/trans_presets.java:2479
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:3176 build/trans_presets.java:3184
-#: build/trans_presets.java:3233 build/trans_presets.java:3240
-#: build/trans_presets.java:3247 build/trans_presets.java:3255
-#: build/trans_presets.java:3262 build/trans_presets.java:3271
-#: build/trans_presets.java:3280 build/trans_presets.java:3287
-#: build/trans_presets.java:3297 build/trans_presets.java:3306
-#: build/trans_presets.java:3312 build/trans_presets.java:3320
-#: build/trans_presets.java:3326 build/trans_presets.java:3334
-#: build/trans_presets.java:3343 build/trans_presets.java:3349
-#: build/trans_presets.java:3356 build/trans_presets.java:3362
-#: build/trans_presets.java:3370 build/trans_presets.java:3377
-#: build/trans_presets.java:3383 build/trans_presets.java:3392
-#: build/trans_presets.java:3400 build/trans_presets.java:3406
-#: build/trans_presets.java:3415 build/trans_presets.java:3424
-#: build/trans_presets.java:3430 build/trans_presets.java:3436
-#: build/trans_presets.java:3446 build/trans_presets.java:3454
-#: build/trans_presets.java:3471 build/trans_presets.java:3480
-#: build/trans_presets.java:3487 build/trans_presets.java:3493
-#: build/trans_presets.java:3499 build/trans_presets.java:3508
-#: build/trans_presets.java:3517 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3540
-#: build/trans_presets.java:3547 build/trans_presets.java:3556
-#: build/trans_presets.java:3563 build/trans_presets.java:3572
-#: build/trans_presets.java:3581 build/trans_presets.java:3590
-#: build/trans_presets.java:3597 build/trans_presets.java:3606
-#: build/trans_presets.java:3612 build/trans_presets.java:3619
-#: build/trans_presets.java:3628 build/trans_presets.java:3634
-#: build/trans_presets.java:3643
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2241
+#: build/trans_presets.java:2327 build/trans_presets.java:2338
+#: build/trans_presets.java:2345 build/trans_presets.java:2398
+#: build/trans_presets.java:2414 build/trans_presets.java:2438
+#: build/trans_presets.java:2472 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2584
+#: build/trans_presets.java:2593 build/trans_presets.java:2624
+#: build/trans_presets.java:2781 build/trans_presets.java:2787
+#: build/trans_presets.java:3332 build/trans_presets.java:3340
+#: build/trans_presets.java:3389 build/trans_presets.java:3396
+#: build/trans_presets.java:3403 build/trans_presets.java:3411
+#: build/trans_presets.java:3418 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3443
+#: build/trans_presets.java:3453 build/trans_presets.java:3462
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3499 build/trans_presets.java:3505
+#: build/trans_presets.java:3512 build/trans_presets.java:3518
+#: build/trans_presets.java:3526 build/trans_presets.java:3533
+#: build/trans_presets.java:3539 build/trans_presets.java:3548
+#: build/trans_presets.java:3556 build/trans_presets.java:3562
+#: build/trans_presets.java:3571 build/trans_presets.java:3580
+#: build/trans_presets.java:3586 build/trans_presets.java:3592
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3627 build/trans_presets.java:3636
+#: build/trans_presets.java:3643 build/trans_presets.java:3649
+#: build/trans_presets.java:3655 build/trans_presets.java:3664
+#: build/trans_presets.java:3673 build/trans_presets.java:3681
+#: build/trans_presets.java:3688 build/trans_presets.java:3696
+#: build/trans_presets.java:3703 build/trans_presets.java:3712
+#: build/trans_presets.java:3719 build/trans_presets.java:3728
+#: build/trans_presets.java:3737 build/trans_presets.java:3746
+#: build/trans_presets.java:3753 build/trans_presets.java:3762
+#: build/trans_presets.java:3768 build/trans_presets.java:3775
+#: build/trans_presets.java:3784 build/trans_presets.java:3790
+#: build/trans_presets.java:3799
 msgid "24/7"
 msgstr "24/7"
@@ -24554 +25217 @@
 #. item "Culture/Museum" combo "Opening Hours" display value
 #. item "Culture/Library" combo "Opening Hours" display value
-#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting" display value
 #. item "Public Building/Community Centre" combo "Opening Hours" display value
 #. item "Health/Doctors" combo "Opening Hours" display value
@@ -24618 +25281 @@
 #. item "Other/Toys" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2107
-#: build/trans_presets.java:2193 build/trans_presets.java:2204
-#: build/trans_presets.java:2211 build/trans_presets.java:2227
-#: build/trans_presets.java:2264 build/trans_presets.java:2280
-#: build/trans_presets.java:2303 build/trans_presets.java:2337
-#: build/trans_presets.java:2422 build/trans_presets.java:2428
-#: build/trans_presets.java:2436 build/trans_presets.java:2445
-#: build/trans_presets.java:2479 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:3176
-#: build/trans_presets.java:3184 build/trans_presets.java:3233
-#: build/trans_presets.java:3240 build/trans_presets.java:3247
-#: build/trans_presets.java:3255 build/trans_presets.java:3262
-#: build/trans_presets.java:3271 build/trans_presets.java:3280
-#: build/trans_presets.java:3287 build/trans_presets.java:3297
-#: build/trans_presets.java:3306 build/trans_presets.java:3312
-#: build/trans_presets.java:3320 build/trans_presets.java:3326
-#: build/trans_presets.java:3334 build/trans_presets.java:3343
-#: build/trans_presets.java:3349 build/trans_presets.java:3356
-#: build/trans_presets.java:3362 build/trans_presets.java:3370
-#: build/trans_presets.java:3377 build/trans_presets.java:3383
-#: build/trans_presets.java:3392 build/trans_presets.java:3400
-#: build/trans_presets.java:3406 build/trans_presets.java:3415
-#: build/trans_presets.java:3424 build/trans_presets.java:3430
-#: build/trans_presets.java:3436 build/trans_presets.java:3446
-#: build/trans_presets.java:3454 build/trans_presets.java:3471
-#: build/trans_presets.java:3480 build/trans_presets.java:3487
-#: build/trans_presets.java:3493 build/trans_presets.java:3499
-#: build/trans_presets.java:3508 build/trans_presets.java:3517
-#: build/trans_presets.java:3525 build/trans_presets.java:3532
-#: build/trans_presets.java:3540 build/trans_presets.java:3547
-#: build/trans_presets.java:3556 build/trans_presets.java:3563
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3590 build/trans_presets.java:3597
-#: build/trans_presets.java:3606 build/trans_presets.java:3612
-#: build/trans_presets.java:3619 build/trans_presets.java:3628
-#: build/trans_presets.java:3634 build/trans_presets.java:3643
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2241
+#: build/trans_presets.java:2327 build/trans_presets.java:2338
+#: build/trans_presets.java:2345 build/trans_presets.java:2361
+#: build/trans_presets.java:2398 build/trans_presets.java:2414
+#: build/trans_presets.java:2438 build/trans_presets.java:2472
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2584 build/trans_presets.java:2593
+#: build/trans_presets.java:2624 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:3332
+#: build/trans_presets.java:3340 build/trans_presets.java:3389
+#: build/trans_presets.java:3396 build/trans_presets.java:3403
+#: build/trans_presets.java:3411 build/trans_presets.java:3418
+#: build/trans_presets.java:3427 build/trans_presets.java:3436
+#: build/trans_presets.java:3443 build/trans_presets.java:3453
+#: build/trans_presets.java:3462 build/trans_presets.java:3468
+#: build/trans_presets.java:3476 build/trans_presets.java:3482
+#: build/trans_presets.java:3490 build/trans_presets.java:3499
+#: build/trans_presets.java:3505 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3526
+#: build/trans_presets.java:3533 build/trans_presets.java:3539
+#: build/trans_presets.java:3548 build/trans_presets.java:3556
+#: build/trans_presets.java:3562 build/trans_presets.java:3571
+#: build/trans_presets.java:3580 build/trans_presets.java:3586
+#: build/trans_presets.java:3592 build/trans_presets.java:3602
+#: build/trans_presets.java:3610 build/trans_presets.java:3627
+#: build/trans_presets.java:3636 build/trans_presets.java:3643
+#: build/trans_presets.java:3649 build/trans_presets.java:3655
+#: build/trans_presets.java:3664 build/trans_presets.java:3673
+#: build/trans_presets.java:3681 build/trans_presets.java:3688
+#: build/trans_presets.java:3696 build/trans_presets.java:3703
+#: build/trans_presets.java:3712 build/trans_presets.java:3719
+#: build/trans_presets.java:3728 build/trans_presets.java:3737
+#: build/trans_presets.java:3746 build/trans_presets.java:3753
+#: build/trans_presets.java:3762 build/trans_presets.java:3768
+#: build/trans_presets.java:3775 build/trans_presets.java:3784
+#: build/trans_presets.java:3790 build/trans_presets.java:3799
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Ma-Vr 08:30-20:00"
@@ -24685 +25348 @@
 #. item "Culture/Museum" combo "Opening Hours" display value
 #. item "Culture/Library" combo "Opening Hours" display value
-#. item "Culture/Place of Worship" combo "Opening Hours" display value
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting" display value
 #. item "Health/Doctors" combo "Opening Hours" display value
 #. item "Health/Dentist" combo "Opening Hours" display value
@@ -24728 +25391 @@
 #. item "Other/Travel Agency" combo "Opening Hours" display value
 #. item "Other/Toys" combo "Opening Hours" display value
-#: build/trans_presets.java:1467 build/trans_presets.java:1500
-#: build/trans_presets.java:1516 build/trans_presets.java:1524
-#: build/trans_presets.java:1540 build/trans_presets.java:1549
-#: build/trans_presets.java:1568 build/trans_presets.java:1951
-#: build/trans_presets.java:1971 build/trans_presets.java:1988
-#: build/trans_presets.java:2007 build/trans_presets.java:2026
-#: build/trans_presets.java:2042 build/trans_presets.java:2059
-#: build/trans_presets.java:2076 build/trans_presets.java:2107
-#: build/trans_presets.java:2193 build/trans_presets.java:2204
-#: build/trans_presets.java:2211 build/trans_presets.java:2264
-#: build/trans_presets.java:2280 build/trans_presets.java:2303
-#: build/trans_presets.java:2422 build/trans_presets.java:2428
-#: build/trans_presets.java:2436 build/trans_presets.java:2479
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:3176 build/trans_presets.java:3184
-#: build/trans_presets.java:3233 build/trans_presets.java:3240
-#: build/trans_presets.java:3247 build/trans_presets.java:3255
-#: build/trans_presets.java:3262 build/trans_presets.java:3287
-#: build/trans_presets.java:3312 build/trans_presets.java:3320
-#: build/trans_presets.java:3326 build/trans_presets.java:3334
-#: build/trans_presets.java:3349 build/trans_presets.java:3356
-#: build/trans_presets.java:3362 build/trans_presets.java:3370
-#: build/trans_presets.java:3377 build/trans_presets.java:3383
-#: build/trans_presets.java:3400 build/trans_presets.java:3406
-#: build/trans_presets.java:3430 build/trans_presets.java:3436
-#: build/trans_presets.java:3446 build/trans_presets.java:3454
-#: build/trans_presets.java:3487 build/trans_presets.java:3493
-#: build/trans_presets.java:3499 build/trans_presets.java:3525
-#: build/trans_presets.java:3532 build/trans_presets.java:3540
-#: build/trans_presets.java:3547 build/trans_presets.java:3563
-#: build/trans_presets.java:3597 build/trans_presets.java:3612
-#: build/trans_presets.java:3619 build/trans_presets.java:3634
+#: build/trans_presets.java:1601 build/trans_presets.java:1634
+#: build/trans_presets.java:1650 build/trans_presets.java:1658
+#: build/trans_presets.java:1674 build/trans_presets.java:1683
+#: build/trans_presets.java:1702 build/trans_presets.java:2085
+#: build/trans_presets.java:2105 build/trans_presets.java:2122
+#: build/trans_presets.java:2141 build/trans_presets.java:2160
+#: build/trans_presets.java:2176 build/trans_presets.java:2193
+#: build/trans_presets.java:2210 build/trans_presets.java:2241
+#: build/trans_presets.java:2327 build/trans_presets.java:2338
+#: build/trans_presets.java:2345 build/trans_presets.java:2398
+#: build/trans_presets.java:2414 build/trans_presets.java:2438
+#: build/trans_presets.java:2563 build/trans_presets.java:2569
+#: build/trans_presets.java:2584 build/trans_presets.java:2624
+#: build/trans_presets.java:2781 build/trans_presets.java:2787
+#: build/trans_presets.java:3332 build/trans_presets.java:3340
+#: build/trans_presets.java:3389 build/trans_presets.java:3396
+#: build/trans_presets.java:3403 build/trans_presets.java:3411
+#: build/trans_presets.java:3418 build/trans_presets.java:3443
+#: build/trans_presets.java:3468 build/trans_presets.java:3476
+#: build/trans_presets.java:3482 build/trans_presets.java:3490
+#: build/trans_presets.java:3505 build/trans_presets.java:3512
+#: build/trans_presets.java:3518 build/trans_presets.java:3526
+#: build/trans_presets.java:3533 build/trans_presets.java:3539
+#: build/trans_presets.java:3556 build/trans_presets.java:3562
+#: build/trans_presets.java:3586 build/trans_presets.java:3592
+#: build/trans_presets.java:3602 build/trans_presets.java:3610
+#: build/trans_presets.java:3643 build/trans_presets.java:3649
+#: build/trans_presets.java:3655 build/trans_presets.java:3681
+#: build/trans_presets.java:3688 build/trans_presets.java:3696
+#: build/trans_presets.java:3703 build/trans_presets.java:3719
+#: build/trans_presets.java:3753 build/trans_presets.java:3768
+#: build/trans_presets.java:3775 build/trans_presets.java:3790
 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:1468
+#: build/trans_presets.java:1602
 msgid "With shop"
 msgstr "Met shop"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1602
 msgid "convenience"
 msgstr "voeding"
 
 #. item "Car/Fuel" combo "With shop" display value
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1602
 msgid "kiosk"
 msgstr "tijdschriften"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1603
 msgid "Fuel types:"
 msgstr "Brandstoffen"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1470
+#: build/trans_presets.java:1604
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1605
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1606
 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:1473
+#: build/trans_presets.java:1607
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel (rode, voor landbouw en machines)"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1608
 msgid "Octane 91"
 msgstr "91 Octaan"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1609
 msgid "Octane 95"
 msgstr "95 Octaan"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1610
 msgid "Octane 98"
 msgstr "98 Octane"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1477
+#: build/trans_presets.java:1611
 msgid "Octane 100"
 msgstr "100 Octaan"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1612
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1613
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1480
+#: build/trans_presets.java:1614
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1615
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Samengedrukt Aardgas)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1616
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (tweetakt)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1483
+#: build/trans_presets.java:1617
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (tweetakt)"
@@ -24855 +25518 @@
 #. </optional>
 #. item "Car/Charging Station"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1620
 msgid "Charging Station"
 msgstr "Oplaadstation"
@@ -24861 +25524 @@
 #. <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:1488
+#: build/trans_presets.java:1622
 msgid "Edit Charging Station (for electric cars)"
 msgstr "Wijzig Oplaadstation (voor elektrische auto''s)"
 
 #. item "Car/Charging Station" text "Amperage"
-#: build/trans_presets.java:1492
+#: build/trans_presets.java:1626
 msgid "Amperage"
 msgstr "Laadstroom"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1628
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item "Car/Wash" label "Edit Car Wash"
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1629
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
@@ -24882 +25545 @@
 #. <separator/>
 #. item "Car/Car Dealer"
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1637
 msgid "Car Dealer"
 msgstr "Autodealer"
@@ -24888 +25551 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
 #. item "Car/Car Dealer" label "Edit Car Shop"
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1639
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
@@ -24894 +25557 @@
 #. item "Car/Repair"
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair"
-#: build/trans_presets.java:1510 build/trans_presets.java:1572
+#: build/trans_presets.java:1644 build/trans_presets.java:1706
 msgid "Repair"
 msgstr "Garage"
 
 #. item "Car/Repair" label "Edit Car Repair"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1645
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1652
 msgid "Tyres"
 msgstr "Banden"
 
 #. item "Car/Tyres" label "Edit Tyres"
-#: build/trans_presets.java:1519
+#: build/trans_presets.java:1653
 msgid "Edit Tyres"
 msgstr "Wijzig Banden"
@@ -24915 +25578 @@
 #. item "Car/Tyres" label "Contact:"
 #. item "Motorcycle/Motorcycle Dealer" label "Contact:"
-#: build/trans_presets.java:1525 build/trans_presets.java:1577
+#: build/trans_presets.java:1659 build/trans_presets.java:1711
 msgid "Contact:"
 msgstr "wijzig Banden"
@@ -24957 +25620 @@
 #. <space />
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1526 build/trans_presets.java:1578
-#: build/trans_presets.java:1811 build/trans_presets.java:1829
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1880 build/trans_presets.java:1897
-#: build/trans_presets.java:1919 build/trans_presets.java:1936
-#: build/trans_presets.java:1959 build/trans_presets.java:1978
-#: build/trans_presets.java:1995 build/trans_presets.java:2014
-#: build/trans_presets.java:2033 build/trans_presets.java:2049
-#: build/trans_presets.java:2066 build/trans_presets.java:2081
-#: build/trans_presets.java:2313 build/trans_presets.java:2469
-#: build/trans_presets.java:4085
+#: build/trans_presets.java:1660 build/trans_presets.java:1712
+#: build/trans_presets.java:1945 build/trans_presets.java:1963
+#: build/trans_presets.java:1979 build/trans_presets.java:1996
+#: build/trans_presets.java:2014 build/trans_presets.java:2031
+#: build/trans_presets.java:2053 build/trans_presets.java:2070
+#: build/trans_presets.java:2093 build/trans_presets.java:2112
+#: build/trans_presets.java:2129 build/trans_presets.java:2148
+#: build/trans_presets.java:2167 build/trans_presets.java:2183
+#: build/trans_presets.java:2200 build/trans_presets.java:2215
+#: build/trans_presets.java:2448 build/trans_presets.java:2613
+#: build/trans_presets.java:4248
 msgid "Phone Number"
 msgstr "Telefoonnummer"
@@ -24990 +25653 @@
 #. item "Food+Drinks/Nightclub" text "Fax Number"
 #. item "Annotation/Contact" text "Fax Number"
-#: build/trans_presets.java:1527 build/trans_presets.java:1579
-#: build/trans_presets.java:1812 build/trans_presets.java:1830
-#: build/trans_presets.java:1846 build/trans_presets.java:1863
-#: build/trans_presets.java:1881 build/trans_presets.java:1898
-#: build/trans_presets.java:1920 build/trans_presets.java:1937
-#: build/trans_presets.java:1960 build/trans_presets.java:1979
-#: build/trans_presets.java:1996 build/trans_presets.java:2015
-#: build/trans_presets.java:2034 build/trans_presets.java:2050
-#: build/trans_presets.java:2067 build/trans_presets.java:2082
-#: build/trans_presets.java:4086
+#: build/trans_presets.java:1661 build/trans_presets.java:1713
+#: build/trans_presets.java:1946 build/trans_presets.java:1964
+#: build/trans_presets.java:1980 build/trans_presets.java:1997
+#: build/trans_presets.java:2015 build/trans_presets.java:2032
+#: build/trans_presets.java:2054 build/trans_presets.java:2071
+#: build/trans_presets.java:2094 build/trans_presets.java:2113
+#: build/trans_presets.java:2130 build/trans_presets.java:2149
+#: build/trans_presets.java:2168 build/trans_presets.java:2184
+#: build/trans_presets.java:2201 build/trans_presets.java:2216
+#: build/trans_presets.java:4249
 msgid "Fax Number"
 msgstr "Faxnummer"
@@ -25024 +25687 @@
 #. <space />
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1528 build/trans_presets.java:1580
-#: build/trans_presets.java:1813 build/trans_presets.java:1831
-#: build/trans_presets.java:1847 build/trans_presets.java:1864
-#: build/trans_presets.java:1882 build/trans_presets.java:1899
-#: build/trans_presets.java:1921 build/trans_presets.java:1938
-#: build/trans_presets.java:1961 build/trans_presets.java:1980
-#: build/trans_presets.java:1997 build/trans_presets.java:2016
-#: build/trans_presets.java:2035 build/trans_presets.java:2051
-#: build/trans_presets.java:2068 build/trans_presets.java:2083
-#: build/trans_presets.java:2314 build/trans_presets.java:4088
+#: build/trans_presets.java:1662 build/trans_presets.java:1714
+#: build/trans_presets.java:1947 build/trans_presets.java:1965
+#: build/trans_presets.java:1981 build/trans_presets.java:1998
+#: build/trans_presets.java:2016 build/trans_presets.java:2033
+#: build/trans_presets.java:2055 build/trans_presets.java:2072
+#: build/trans_presets.java:2095 build/trans_presets.java:2114
+#: build/trans_presets.java:2131 build/trans_presets.java:2150
+#: build/trans_presets.java:2169 build/trans_presets.java:2185
+#: build/trans_presets.java:2202 build/trans_presets.java:2217
+#: build/trans_presets.java:2449 build/trans_presets.java:4251
 msgid "Website"
 msgstr "Website"
@@ -25056 +25719 @@
 #. item "Food+Drinks/Nightclub" text "Email Address"
 #. item "Annotation/Contact" text "Email Address"
-#: build/trans_presets.java:1529 build/trans_presets.java:1581
-#: build/trans_presets.java:1814 build/trans_presets.java:1832
-#: build/trans_presets.java:1848 build/trans_presets.java:1865
-#: build/trans_presets.java:1883 build/trans_presets.java:1900
-#: build/trans_presets.java:1922 build/trans_presets.java:1939
-#: build/trans_presets.java:1962 build/trans_presets.java:1981
-#: build/trans_presets.java:1998 build/trans_presets.java:2017
-#: build/trans_presets.java:2036 build/trans_presets.java:2052
-#: build/trans_presets.java:2069 build/trans_presets.java:2084
-#: build/trans_presets.java:4089
+#: build/trans_presets.java:1663 build/trans_presets.java:1715
+#: build/trans_presets.java:1948 build/trans_presets.java:1966
+#: build/trans_presets.java:1982 build/trans_presets.java:1999
+#: build/trans_presets.java:2017 build/trans_presets.java:2034
+#: build/trans_presets.java:2056 build/trans_presets.java:2073
+#: build/trans_presets.java:2096 build/trans_presets.java:2115
+#: build/trans_presets.java:2132 build/trans_presets.java:2151
+#: build/trans_presets.java:2170 build/trans_presets.java:2186
+#: build/trans_presets.java:2203 build/trans_presets.java:2218
+#: build/trans_presets.java:4252
 msgid "Email Address"
 msgstr "Emailadres"
@@ -25073 +25736 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Rental"
 #. item "Bicycle/Rental"
-#: build/trans_presets.java:1532 build/trans_presets.java:1571
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1666 build/trans_presets.java:1705
+#: build/trans_presets.java:1740
 msgid "Rental"
 msgstr "Verhuur"
@@ -25081 +25744 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
 #. item "Car/Rental" label "Edit Car Rental"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1669
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Sharing"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1676
 msgid "Sharing"
 msgstr "Autodelen"
@@ -25092 +25755 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #. item "Car/Sharing" label "Edit Car Sharing"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1678
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
 
 #. item "Motorcycle/Parking" label "Edit Motorcycle Parking"
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1688
 msgid "Edit Motorcycle Parking"
 msgstr "Wijzig Motorfietsparking"
@@ -25103 +25766 @@
 #. item "Motorcycle/Parking" text "Capacity"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1557 build/trans_presets.java:1590
+#: build/trans_presets.java:1691 build/trans_presets.java:1724
 msgid "Capacity"
 msgstr "Capaciteit"
 
 #. item "Motorcycle/Motorcycle Dealer"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1695
 msgid "Motorcycle Dealer"
 msgstr "Motorfietsen"
@@ -25114 +25777 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
 #. item "Motorcycle/Motorcycle Dealer" label "Edit Shop Motorcycle"
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1697
 msgid "Edit Shop Motorcycle"
 msgstr "Wijzig Motorfietsen"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand" display value
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1700
 msgid "independent"
 msgstr "Onafhankelijk"
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1703
 msgid "Services:"
 msgstr "Diensten:"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale"
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgid "Sale"
 msgstr "Verkoop"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "yes"
@@ -25140 +25803 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "brand"
@@ -25146 +25809 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "used"
@@ -25152 +25815 @@
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value
-#: build/trans_presets.java:1570
+#: build/trans_presets.java:1704
 msgctxt "motorcycle"
 msgid "no"
@@ -25161 +25824 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Clothes" display value
-#: build/trans_presets.java:1571 build/trans_presets.java:1572
-#: build/trans_presets.java:1574 build/trans_presets.java:1575
+#: build/trans_presets.java:1705 build/trans_presets.java:1706
+#: build/trans_presets.java:1708 build/trans_presets.java:1709
 msgid "brand"
 msgstr "merk"
@@ -25168 +25831 @@
 #. item "Motorcycle/Motorcycle Dealer" combo "Repair" display value
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts" display value
-#: build/trans_presets.java:1572 build/trans_presets.java:1574
+#: build/trans_presets.java:1706 build/trans_presets.java:1708
 msgid "oldtimer"
 msgstr "oldtimer"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "Safety inspection"
 msgstr "Keuring"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "DEKRA"
 msgstr "DEKRA"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "GTÜ"
 msgstr "GTÜ"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "MOT"
 msgstr "MOT"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1707
 msgid "TÜV"
 msgstr "TÜV"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1708
 msgid "Parts"
 msgstr "Onderdelen"
@@ -25206 +25869 @@
 #. group "Clothes"
 #. item "Clothes/Clothes"
-#: build/trans_presets.java:1575 build/trans_presets.java:2533
-#: build/trans_presets.java:3329 build/trans_presets.java:3330
+#: build/trans_presets.java:1709 build/trans_presets.java:2678
+#: build/trans_presets.java:3485 build/trans_presets.java:3486
 msgid "Clothes"
 msgstr "Kleding"
@@ -25213 +25876 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
 #. item "Bicycle/Parking" label "Edit Bicycle Parking"
-#: build/trans_presets.java:1587
+#: build/trans_presets.java:1721
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
 
 #. item "Bicycle/Bike Dealer"
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1726
 msgid "Bike Dealer"
 msgstr "Fietshandelaar"
@@ -25225 +25888 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
 #. item "Bicycle/Bike Dealer" label "Edit Bicycle Shop"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1729
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are sold"
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1732
 msgid "Bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Second-hand bicycles are sold"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1733
 msgid "Second-hand bicycles are sold"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are repaired"
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1734
 msgid "Bicycles are repaired"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Bicycles are rented"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1735
 msgid "Bicycles are rented"
 msgstr ""
 
 #. item "Bicycle/Bike Dealer" check "Free bicycle pump"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1736
 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:1603
+#: build/trans_presets.java:1737
 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:1604
+#: build/trans_presets.java:1738
 msgid "Bicycles are washed (for a fee)"
 msgstr ""
@@ -25267 +25930 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1743
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1748
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:38
 msgid "Public Transport"
@@ -25278 +25941 @@
 
 #. item "Public Transport/Station"
-#: build/trans_presets.java:1615
+#: build/trans_presets.java:1749
 msgctxt "railway"
 msgid "Station"
@@ -25286 +25949 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
 #. item "Public Transport/Station" label "Edit Station"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1752
 msgctxt "railway"
 msgid "Edit Station"
@@ -25292 +25955 @@
 
 #. item "Public Transport/Station" text "UIC-Reference"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1757
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -25298 +25961 @@
 #. </optional>
 #. item "Public Transport/Railway Halt"
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1760
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -25304 +25967 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
 #. item "Public Transport/Railway Halt" label "Edit Halt"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1762
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -25310 +25973 @@
 #. </optional>
 #. item "Public Transport/Tram Stop"
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1769
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -25317 +25980 @@
 #. 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:1638
+#: build/trans_presets.java:1772
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -25323 +25986 @@
 #. </optional>
 #. item "Public Transport/Railway Platform"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1779
 msgid "Railway Platform"
 msgstr "Perron"
@@ -25330 +25993 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1782
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -25340 +26003 @@
 #. <space />
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:1651 build/trans_presets.java:1696
+#: build/trans_presets.java:1785 build/trans_presets.java:1830
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -25347 +26010 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. item "Leisure/Dog Park" check "Area"
-#: build/trans_presets.java:1653 build/trans_presets.java:1698
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:1787 build/trans_presets.java:1832
+#: build/trans_presets.java:2336
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Subway Entrance"
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1789
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -25360 +26023 @@
 #. 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:1658
+#: build/trans_presets.java:1792
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
@@ -25366 +26029 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #. item "Facilities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:1663 build/trans_presets.java:2490
+#: build/trans_presets.java:1797 build/trans_presets.java:2635
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -25373 +26036 @@
 #. <separator/>
 #. item "Public Transport/Bus Station"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1802
 msgid "Bus Station"
 msgstr "Busstation"
@@ -25380 +26043 @@
 #. 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:1671
+#: build/trans_presets.java:1805
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -25386 +26049 @@
 #. </optional>
 #. item "Public Transport/Bus Stop"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1811
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -25394 +26057 @@
 #. 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:1681
+#: build/trans_presets.java:1815
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -25401 +26064 @@
 #. item "Facilities/Shelter"
 #. item "Facilities/Hunting Stand" combo "Shelter"
-#: build/trans_presets.java:1686 build/trans_presets.java:2553
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:1820 build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:23
 #: ../plugins/public_transport/src/public_transport/WaypointTableModel.java:28
@@ -25412 +26075 @@
 #. <separator/>
 #. item "Facilities/Bench"
-#: build/trans_presets.java:1687 build/trans_presets.java:2545
+#: build/trans_presets.java:1821 build/trans_presets.java:2690
 msgid "Bench"
 msgstr "Bank"
 
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1822
 msgid "Tactile Paving"
 msgstr ""
@@ -25423 +26086 @@
 #. </optional>
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1826
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item "Public Transport/Bus Platform" label "Edit Bus Platform"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1827
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -25434 +26097 @@
 #. <separator/>
 #. item "Public Transport/Ticket Machine"
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1835
 msgid "Ticket Machine"
 msgstr "Vervoerbewijsautomaat"
 
 #. item "Public Transport/Ticket Machine" text "Reference Number"
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1841
 msgid "Reference Number"
 msgstr "Referentienummer"
@@ -25446 +26109 @@
 #. item "Facilities/Telephone" check "Coins"
 #. item "Vending machine" check "Coins"
-#: build/trans_presets.java:1708 build/trans_presets.java:2504
-#: build/trans_presets.java:3654
+#: build/trans_presets.java:1842 build/trans_presets.java:2649
+#: build/trans_presets.java:3810
 msgid "Coins"
 msgstr "Munten"
@@ -25454 +26117 @@
 #. item "Facilities/Telephone" check "Notes"
 #. item "Vending machine" check "Notes"
-#: build/trans_presets.java:1709 build/trans_presets.java:2505
-#: build/trans_presets.java:3655
+#: build/trans_presets.java:1843 build/trans_presets.java:2650
+#: build/trans_presets.java:3811
 msgid "Notes"
 msgstr "Briefgeld"
@@ -25462 +26125 @@
 #. item "Facilities/Telephone" check "Electronic purses and Charge cards"
 #. item "Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:1710 build/trans_presets.java:2506
-#: build/trans_presets.java:3656
+#: build/trans_presets.java:1844 build/trans_presets.java:2651
+#: build/trans_presets.java:3812
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -25470 +26133 @@
 #. item "Facilities/Telephone" check "Debit cards"
 #. item "Vending machine" check "Debit cards"
-#: build/trans_presets.java:1711 build/trans_presets.java:2507
-#: build/trans_presets.java:3657
+#: build/trans_presets.java:1845 build/trans_presets.java:2652
+#: build/trans_presets.java:3813
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -25478 +26141 @@
 #. item "Facilities/Telephone" check "Credit cards"
 #. item "Vending machine" check "Credit cards"
-#: build/trans_presets.java:1712 build/trans_presets.java:2508
-#: build/trans_presets.java:3658
+#: build/trans_presets.java:1846 build/trans_presets.java:2653
+#: build/trans_presets.java:3814
 msgid "Credit cards"
 msgstr "Creditkaart"
@@ -25485 +26148 @@
 #. item "Public Transport/Ticket Machine" check "Account or loyalty cards"
 #. item "Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:1713 build/trans_presets.java:3659
+#: build/trans_presets.java:1847 build/trans_presets.java:3815
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Taxi"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1850
 msgid "Taxi"
 msgstr "Taxi"
@@ -25496 +26159 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
 #. item "Taxi" label "Edit Taxi station"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1852
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -25502 +26165 @@
 #. <separator/>
 #. group "Airport"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1857
 msgid "Airport"
 msgstr "Luchthaven"
 
 #. item "Airport/Airport Ground"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1858
 msgid "Airport Ground"
 msgstr ""
@@ -25513 +26176 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
 #. item "Airport/Airport Ground" label "Edit Airport Ground"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1860
 msgid "Edit Airport Ground"
 msgstr ""
@@ -25519 +26182 @@
 #. <optional>
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1864
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "ICAO"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1865
 msgid "ICAO"
 msgstr "ICAO"
@@ -25531 +26194 @@
 #. <separator/>
 #. item "Airport/Runway"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1870
 msgid "Runway"
 msgstr "Startbaan"
@@ -25537 +26200 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
 #. item "Airport/Runway" label "Edit Runway"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1872
 msgid "Edit Runway"
 msgstr "Wijzig Startbaan"
@@ -25543 +26206 @@
 #. </optional>
 #. item "Airport/Taxiway"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1878
 msgid "Taxiway"
 msgstr ""
@@ -25549 +26212 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
 #. item "Airport/Taxiway" label "Edit Taxiway"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1880
 msgid "Edit Taxiway"
 msgstr ""
@@ -25555 +26218 @@
 #. </optional>
 #. item "Airport/Helipad"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1886
 msgid "Helipad"
 msgstr ""
@@ -25561 +26224 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
 #. item "Airport/Helipad" label "Edit Helipad"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1888
 msgid "Edit Helipad"
 msgstr ""
@@ -25569 +26232 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
 #. item "Airport/Apron" label "Apron"
-#: build/trans_presets.java:1760 build/trans_presets.java:1762
+#: build/trans_presets.java:1894 build/trans_presets.java:1896
 msgid "Apron"
 msgstr ""
@@ -25577 +26240 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
 #. item "Airport/Hangar" label "Hangar"
-#: build/trans_presets.java:1765 build/trans_presets.java:1767
+#: build/trans_presets.java:1899 build/trans_presets.java:1901
 msgid "Hangar"
 msgstr "Hangar"
@@ -25586 +26249 @@
 #. item "Airport/Beacon" label "Beacon"
 #. item "Man Made/Man Made/Beacon"
-#: build/trans_presets.java:1770 build/trans_presets.java:1772
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:1904 build/trans_presets.java:1906
+#: build/trans_presets.java:3204
 msgid "Beacon"
 msgstr "Baken"
@@ -25595 +26258 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
 #. item "Airport/Windsock" label "Windsock"
-#: build/trans_presets.java:1775 build/trans_presets.java:1777
+#: build/trans_presets.java:1909 build/trans_presets.java:1911
 msgid "Windsock"
 msgstr "Windvaan"
@@ -25602 +26265 @@
 #. <separator/>
 #. item "Airport/Terminal"
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1915
 msgid "Terminal"
 msgstr "Terminal"
@@ -25608 +26271 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
 #. item "Airport/Terminal" label "Edit Terminal"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1917
 msgid "Edit Terminal"
 msgstr "Wijzig Terminal"
 
 #. item "Airport/Gate"
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1921
 msgctxt "airport"
 msgid "Gate"
@@ -25620 +26283 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
 #. item "Airport/Gate" label "Edit Terminal Gate"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1923
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. group "Facilities"
-#: build/trans_presets.java:1795 build/trans_presets.java:2482
+#: build/trans_presets.java:1929 build/trans_presets.java:2627
 msgid "Facilities"
 msgstr ""
 
 #. group "Facilities/Accommodation"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1930
 msgid "Accommodation"
 msgstr ""
@@ -25640 +26303 @@
 #. </button>
 #. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
-#: build/trans_presets.java:1797 build/trans_surveyor.java:43
+#: build/trans_presets.java:1931 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -25647 +26310 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
 #. item "Facilities/Accommodation/Hotel" label "Edit Hotel"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1934
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
@@ -25659 +26322 @@
 #. item "Facilities/Accommodation/Camping Site" combo "Stars"
 #. item "Food+Drinks/Restaurant" combo "Stars"
-#: build/trans_presets.java:1804 build/trans_presets.java:1822
-#: build/trans_presets.java:1838 build/trans_presets.java:1855
-#: build/trans_presets.java:1873 build/trans_presets.java:1907
-#: build/trans_presets.java:1929 build/trans_presets.java:1952
+#: build/trans_presets.java:1938 build/trans_presets.java:1956
+#: build/trans_presets.java:1972 build/trans_presets.java:1989
+#: build/trans_presets.java:2007 build/trans_presets.java:2041
+#: build/trans_presets.java:2063 build/trans_presets.java:2086
 msgid "Stars"
 msgstr "Sterren"
@@ -25696 +26359 @@
 #. <space />
 #. item "Food+Drinks/Bar" combo "Internet access"
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195
 msgid "Internet access"
 msgstr "Internettoegang"
@@ -25722 +26385 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195
 msgid "wlan"
 msgstr "wlan"
@@ -25748 +26411 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access" display value
 #. item "Food+Drinks/Bar" combo "Internet access" display value
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195
 msgid "wired"
 msgstr ""
@@ -25780 +26443 @@
 #. <condition k="aeroway" v="terminal"/>
 #. color terminal
-#: build/trans_presets.java:1806 build/trans_presets.java:1824
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1875 build/trans_presets.java:1892
-#: build/trans_presets.java:1909 build/trans_presets.java:1931
-#: build/trans_presets.java:1954 build/trans_presets.java:1973
-#: build/trans_presets.java:1990 build/trans_presets.java:2009
-#: build/trans_presets.java:2028 build/trans_presets.java:2044
-#: build/trans_presets.java:2061 build/trans_style.java:1069
+#: build/trans_presets.java:1940 build/trans_presets.java:1958
+#: build/trans_presets.java:1974 build/trans_presets.java:1991
+#: build/trans_presets.java:2009 build/trans_presets.java:2026
+#: build/trans_presets.java:2043 build/trans_presets.java:2065
+#: build/trans_presets.java:2088 build/trans_presets.java:2107
+#: build/trans_presets.java:2124 build/trans_presets.java:2143
+#: build/trans_presets.java:2162 build/trans_presets.java:2178
+#: build/trans_presets.java:2195 build/trans_style.java:1069
 msgid "terminal"
 msgstr "terminal"
@@ -25806 +26469 @@
 #. item "Food+Drinks/Biergarten" combo "Internet access fee"
 #. item "Food+Drinks/Bar" combo "Internet access fee"
-#: build/trans_presets.java:1807 build/trans_presets.java:1825
-#: build/trans_presets.java:1841 build/trans_presets.java:1858
-#: build/trans_presets.java:1876 build/trans_presets.java:1893
-#: build/trans_presets.java:1910 build/trans_presets.java:1932
-#: build/trans_presets.java:1955 build/trans_presets.java:1974
-#: build/trans_presets.java:1991 build/trans_presets.java:2010
-#: build/trans_presets.java:2029 build/trans_presets.java:2045
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:1941 build/trans_presets.java:1959
+#: build/trans_presets.java:1975 build/trans_presets.java:1992
+#: build/trans_presets.java:2010 build/trans_presets.java:2027
+#: build/trans_presets.java:2044 build/trans_presets.java:2066
+#: build/trans_presets.java:2089 build/trans_presets.java:2108
+#: build/trans_presets.java:2125 build/trans_presets.java:2144
+#: build/trans_presets.java:2163 build/trans_presets.java:2179
+#: build/trans_presets.java:2196
 msgid "Internet access fee"
 msgstr "Bedrag internet toegang"
@@ -25834 +26497 @@
 #. <space />
 #. item "Food+Drinks/Nightclub" combo "Smoking"
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "Smoking"
 msgstr "Roken"
@@ -25861 +26524 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "dedicated"
 msgstr "toegewezen"
@@ -25888 +26551 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "separated"
 msgstr "apart"
@@ -25915 +26578 @@
 #. item "Food+Drinks/Bar" combo "Smoking" display value
 #. item "Food+Drinks/Nightclub" combo "Smoking" display value
-#: build/trans_presets.java:1808 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1859
-#: build/trans_presets.java:1877 build/trans_presets.java:1894
-#: build/trans_presets.java:1911 build/trans_presets.java:1933
-#: build/trans_presets.java:1956 build/trans_presets.java:1975
-#: build/trans_presets.java:1992 build/trans_presets.java:2011
-#: build/trans_presets.java:2030 build/trans_presets.java:2046
-#: build/trans_presets.java:2063 build/trans_presets.java:2078
+#: build/trans_presets.java:1942 build/trans_presets.java:1960
+#: build/trans_presets.java:1976 build/trans_presets.java:1993
+#: build/trans_presets.java:2011 build/trans_presets.java:2028
+#: build/trans_presets.java:2045 build/trans_presets.java:2067
+#: build/trans_presets.java:2090 build/trans_presets.java:2109
+#: build/trans_presets.java:2126 build/trans_presets.java:2145
+#: build/trans_presets.java:2164 build/trans_presets.java:2180
+#: build/trans_presets.java:2197 build/trans_presets.java:2212
 msgid "isolated"
 msgstr "afgescheiden"
 
 #. item "Facilities/Accommodation/Motel"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1950
 msgid "Motel"
 msgstr "Motel"
@@ -25933 +26596 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #. item "Facilities/Accommodation/Motel" label "Edit Motel"
-#: build/trans_presets.java:1818
+#: build/trans_presets.java:1952
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Facilities/Accommodation/Guest House"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1968
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Facilities/Accommodation/Guest House" label "Edit Guest House"
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1969
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Facilities/Accommodation/Chalet"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1984
 msgid "Chalet"
 msgstr "Chalet"
@@ -25954 +26617 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #. item "Facilities/Accommodation/Chalet" label "Edit Chalet"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1986
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Facilities/Accommodation/Hostel"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:2001
 msgid "Hostel"
 msgstr "Hostel"
@@ -25965 +26628 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
 #. item "Facilities/Accommodation/Hostel" label "Edit Hostel"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2003
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Facilities/Accommodation/Alpine Hut"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2019
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Facilities/Accommodation/Alpine Hut" label "Edit Alpine Hut"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2020
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
@@ -25981 +26644 @@
 #. <separator/>
 #. item "Facilities/Accommodation/Caravan Site"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2037
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item "Facilities/Accommodation/Caravan Site" label "Edit Caravan Site"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2038
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
@@ -25992 +26655 @@
 #. <space />
 #. item "Facilities/Accommodation/Caravan Site" text "Number of places"
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:2048
 msgid "Number of places"
 msgstr "Aantal plaatsen"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2049
 msgid "Requires a fee"
 msgstr "Tegen betaling"
 
 #. item "Facilities/Accommodation/Caravan Site" combo "Requires a fee" display value
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:2049
 msgid "interval"
 msgstr "interval"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Power supply"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2050
 msgid "Power supply"
 msgstr "Energieaansluiting"
 
 #. item "Facilities/Accommodation/Caravan Site" check "Tents allowed"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2051
 msgid "Tents allowed"
 msgstr "Tenten toegelaten"
 
 #. item "Facilities/Accommodation/Camping Site"
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:2058
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -26023 +26686 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #. item "Facilities/Accommodation/Camping Site" label "Edit Camping Site"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:2060
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. group "Food+Drinks"
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:2076
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -26037 +26700 @@
 #. </button>
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
-#: build/trans_presets.java:1943 build/trans_surveyor.java:47
+#: build/trans_presets.java:2077 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26043 +26706 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:2079
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -26050 +26713 @@
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
+#: build/trans_presets.java:2140
 msgid "Cuisine"
 msgstr "Keuken"
@@ -26057 +26720 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "italian"
 msgstr "Italiaanse keuken"
@@ -26063 +26726 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "chinese"
 msgstr "Chinese keuken"
@@ -26069 +26732 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "pizza"
 msgstr "pizza"
@@ -26075 +26738 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "burger"
 msgstr "hamburger"
@@ -26081 +26744 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "greek"
 msgstr "Grieks"
@@ -26087 +26750 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "german"
 msgstr "Duits"
@@ -26093 +26756 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "indian"
 msgstr "Indiaas"
@@ -26099 +26762 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "regional"
 msgstr "lokaal"
@@ -26105 +26768 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "kebab"
 msgstr "Kebab"
@@ -26111 +26774 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "turkish"
 msgstr "Turks"
@@ -26117 +26780 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "asian"
 msgstr "Oosters"
@@ -26123 +26786 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "thai"
 msgstr "Thais"
@@ -26129 +26792 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "mexican"
 msgstr "Mexicaans"
@@ -26135 +26798 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "japanese"
 msgstr "Japans"
@@ -26141 +26804 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "french"
 msgstr ""
@@ -26147 +26810 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "sandwich"
 msgstr "sandwich"
@@ -26153 +26816 @@
 #. item "Food+Drinks/Restaurant" multiselect "Cuisine" display value
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1949 build/trans_presets.java:1970
+#: build/trans_presets.java:2083 build/trans_presets.java:2104
 msgid "sushi"
 msgstr "sushi"
@@ -26159 +26822 @@
 #. item "Food+Drinks/Restaurant" check "Microbrewery"
 #. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1950 build/trans_presets.java:2025
+#: build/trans_presets.java:2084 build/trans_presets.java:2159
 msgid "Microbrewery"
 msgstr "Microbrouwerij"
 
 #. item "Food+Drinks/Fast Food"
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2098
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -26170 +26833 @@
 #. <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:1966
+#: build/trans_presets.java:2100
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2104
 msgid "fish_and_chips"
 msgstr "vis_en_friet"
 
 #. item "Food+Drinks/Fast Food" combo "Cuisine" display value
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2104
 msgid "chicken"
 msgstr "kip"
 
 #. item "Food+Drinks/Food Court"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2117
 msgid "Food Court"
 msgstr ""
@@ -26191 +26854 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
 #. item "Food+Drinks/Food Court" label "Edit Food Court"
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:2119
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Cafe"
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2134
 msgid "Cafe"
 msgstr "Koffiehuis of Tearoom"
@@ -26202 +26865 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2136
 msgid "Edit Cafe"
 msgstr "Koffiehuis of Tearoom bewerken"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine" display value
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2140
 msgid "ice_cream"
 msgstr "ijsroom"
 
 #. item "Food+Drinks/Pub"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2153
 msgid "Pub"
 msgstr "Kroeg, Café"
@@ -26218 +26881 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
 #. item "Food+Drinks/Pub" label "Edit Pub"
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2155
 msgid "Edit Pub"
 msgstr "Kroeg, Café bewerken"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2172
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten" label "Edit Biergarten"
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2173
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
 #. item "Food+Drinks/Bar"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2188
 msgid "Bar"
 msgstr "Bar"
@@ -26239 +26902 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #. item "Food+Drinks/Bar" label "Edit Bar"
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2190
 msgid "Edit Bar"
 msgstr "Wijzig Bar"
 
 #. item "Food+Drinks/Nightclub"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2205
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -26250 +26913 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
 #. item "Food+Drinks/Nightclub" label "Edit Nightclub"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2207
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
 #. group "Tourism"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2221
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2222
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction" label "Edit Attraction"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2223
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Viewpoint"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2228
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -26276 +26939 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
 #. item "Tourism/Viewpoint" label "Edit Viewpoint"
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2230
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2233
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
@@ -26287 +26950 @@
 #. <separator/>
 #. item "Tourism/Information Office"
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2236
 msgid "Information Office"
 msgstr "Informatiekantoor"
 
 #. item "Tourism/Map"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2243
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2248
 msgid "Detail Grade"
 msgstr "Detailgraad"
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2248
 msgid "topo"
 msgstr "topografisch"
@@ -26333 +26996 @@
 #. <condition k="highway" v="living_street"/>
 #. color street
-#: build/trans_presets.java:2114 build/trans_presets.java:4188
+#: build/trans_presets.java:2248 build/trans_presets.java:4388
 #: build/trans_style.java:477 build/trans_style.java:489
 #: build/trans_style.java:501 build/trans_style.java:507
@@ -26340 +27003 @@
 
 #. item "Tourism/Map" combo "Detail Grade" display value
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2248
 msgid "scheme"
 msgstr "schematisch"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "Shown Area"
 msgstr "Getoond gebied"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "site"
 msgstr "plaatselijk"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "city"
 msgstr "stad"
 
 #. item "Tourism/Map" combo "Shown Area" display value
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2249
 msgid "region"
 msgstr "regio"
@@ -26367 +27030 @@
 #. item "Tourism/Information Board" text "Closer Description"
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2116 build/trans_presets.java:2132
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2250 build/trans_presets.java:2266
+#: build/trans_presets.java:2310
 msgid "Closer Description"
 msgstr "Uitgebreide beschrijving"
@@ -26376 +27039 @@
 #. <space />
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2118 build/trans_presets.java:2141
+#: build/trans_presets.java:2252 build/trans_presets.java:2275
 msgid "Routes shown for:"
 msgstr "Getoonde routes voor:"
@@ -26382 +27045 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2119 build/trans_presets.java:2142
+#: build/trans_presets.java:2253 build/trans_presets.java:2276
 msgid "Hiking"
 msgstr "Wandelen"
@@ -26389 +27052 @@
 #. item "Tourism/Guidepost" check "Cycling"
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2120 build/trans_presets.java:2143
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2254 build/trans_presets.java:2277
+#: build/trans_presets.java:2827
 msgid "Cycling"
 msgstr "Fietsen"
@@ -26396 +27059 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2121 build/trans_presets.java:2144
+#: build/trans_presets.java:2255 build/trans_presets.java:2278
 msgid "Mountainbiking"
 msgstr "Mountainbike"
@@ -26403 +27066 @@
 #. item "Tourism/Guidepost" check "Skiing"
 #. item "Sport/Skiing"
-#: build/trans_presets.java:2122 build/trans_presets.java:2145
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2256 build/trans_presets.java:2279
+#: build/trans_presets.java:2875
 msgid "Skiing"
 msgstr "Skiën"
@@ -26410 +27073 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2123 build/trans_presets.java:2146
+#: build/trans_presets.java:2257 build/trans_presets.java:2280
 msgid "Riding"
 msgstr "Fietsen"
@@ -26416 +27079 @@
 #. item "Tourism/Map" label "... other transportation modes possible"
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2124 build/trans_presets.java:2147
+#: build/trans_presets.java:2258 build/trans_presets.java:2281
 msgid "... other transportation modes possible"
 msgstr "... andere"
 
 #. item "Tourism/Information Board"
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2260
 msgid "Information Board"
 msgstr "Informatiebord"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "Board Content"
 msgstr "Bordinhoud"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "notice"
 msgstr "aankondigingen"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "history"
 msgstr "geschiedenis"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "nature"
 msgstr "natuur"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "wildlife"
 msgstr "Wild"
 
 #. item "Tourism/Information Board" combo "Board Content" display value
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2265
 msgid "plants"
 msgstr "beplanting"
 
 #. item "Tourism/Guidepost"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2268
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Information Terminal"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2283
 msgid "Information Terminal"
 msgstr "Informatie Terminal"
@@ -26467 +27130 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#: build/trans_presets.java:2154 build/trans_presets.java:2164
+#: build/trans_presets.java:2288 build/trans_presets.java:2298
 msgid "Closer description"
 msgstr "Uitgebreide beschrijving"
 
 #. item "Tourism/Audioguide"
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2293
 msgid "Audioguide"
 msgstr "Audiogids"
@@ -26478 +27141 @@
 #. <space />
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2303
 msgid "Audioguide via mobile phone?"
 msgstr "Audiogids via mobiele telefoon"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2304
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
 #. item "Tourism/Other Information Points"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2306
 msgid "Other Information Points"
 msgstr "Andere informatiepunten"
 
 #. group "Leisure"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2313
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. item "Leisure/Cinema"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2314
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -26505 +27168 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
 #. item "Leisure/Cinema" label "Edit Cinema"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2317
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Leisure/Zoo"
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2321
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -26517 +27180 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
 #. item "Leisure/Zoo" label "Edit Zoo"
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2324
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
 #. item "Leisure/Dog Park"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2330
 msgid "Dog Park"
 msgstr ""
@@ -26529 +27192 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park" />
 #. item "Leisure/Dog Park" label "Edit Dog Park"
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2333
 msgid "Edit Dog Park"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2337
 msgid "Barrier"
 msgstr ""
 
 #. item "Leisure/Dog Park" combo "Barrier" display value
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2337
+msgid "fence"
+msgstr "Afsluiting"
+
+#. item "Leisure/Dog Park" combo "Barrier" display value
+#: build/trans_presets.java:2337
 msgid "wall"
 msgstr ""
 
 #. item "Leisure/Theme Park"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2341
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Leisure/Theme Park" label "Edit Theme Park"
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2342
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2347
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park" label "Edit Water Park"
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2348
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Sauna"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2352
 msgid "Sauna"
 msgstr "Sauna"
@@ -26572 +27240 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
 #. item "Leisure/Sauna" label "Edit Sauna"
-#: build/trans_presets.java:2219 build/trans_presets.java:2222
+#: build/trans_presets.java:2353 build/trans_presets.java:2356
 msgid "Edit Sauna"
 msgstr "Wijzig Sauna"
@@ -26598 +27266 @@
 #. item "Other/Musical Instrument" combo "Opening Hours" display value
 #. item "Other/Variety Store" combo "Opening Hours" display value
-#: build/trans_presets.java:2227 build/trans_presets.java:2337
-#: build/trans_presets.java:2445 build/trans_presets.java:3271
-#: build/trans_presets.java:3280 build/trans_presets.java:3297
-#: build/trans_presets.java:3306 build/trans_presets.java:3343
-#: build/trans_presets.java:3392 build/trans_presets.java:3415
-#: build/trans_presets.java:3424 build/trans_presets.java:3471
-#: build/trans_presets.java:3480 build/trans_presets.java:3508
-#: build/trans_presets.java:3517 build/trans_presets.java:3556
-#: build/trans_presets.java:3572 build/trans_presets.java:3581
-#: build/trans_presets.java:3590 build/trans_presets.java:3606
-#: build/trans_presets.java:3628 build/trans_presets.java:3643
+#: build/trans_presets.java:2361 build/trans_presets.java:2472
+#: build/trans_presets.java:2593 build/trans_presets.java:3427
+#: build/trans_presets.java:3436 build/trans_presets.java:3453
+#: build/trans_presets.java:3462 build/trans_presets.java:3499
+#: build/trans_presets.java:3548 build/trans_presets.java:3571
+#: build/trans_presets.java:3580 build/trans_presets.java:3627
+#: build/trans_presets.java:3636 build/trans_presets.java:3664
+#: build/trans_presets.java:3673 build/trans_presets.java:3712
+#: build/trans_presets.java:3728 build/trans_presets.java:3737
+#: build/trans_presets.java:3746 build/trans_presets.java:3762
+#: build/trans_presets.java:3784 build/trans_presets.java:3799
 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:2228
+#: build/trans_presets.java:2362
 msgid "Access"
 msgstr "Toegang"
@@ -26619 +27287 @@
 #. <separator/>
 #. item "Leisure/Playground"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2365
 msgid "Playground"
 msgstr "Speelveld"
@@ -26625 +27293 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
 #. item "Leisure/Playground" label "Edit Playground"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2367
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Picnic Site"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2371
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item "Leisure/Picnic Site" label "Edit Picnic Site"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2372
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
@@ -26641 +27309 @@
 #. item "Leisure/Picnic Site" check "Fireplace"
 #. item "Facilities/Shelter" check "Fireplace"
-#: build/trans_presets.java:2241 build/trans_presets.java:2557
+#: build/trans_presets.java:2375 build/trans_presets.java:2702
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Leisure/Public Grill"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2377
 msgid "Public Grill"
 msgstr "Openbare BBQ"
@@ -26652 +27320 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
 #. item "Leisure/Public Grill" label "Edit Public Grill"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2379
 msgid "Edit Public Grill"
 msgstr "Openbare BBQ bewerken"
 
 #. item "Leisure/Public Grill" combo "Covered"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2383
 msgid "Covered"
 msgstr "Overdekt"
 
 #. item "Leisure/Public Grill" combo "Fuel"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2384
 msgctxt "grill"
 msgid "Fuel"
@@ -26668 +27336 @@
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2384
 msgid "charcoal"
 msgstr "houtskool"
 
 #. item "Leisure/Public Grill" combo "Fuel" display value
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2384
 msgid "electric"
 msgstr "elektrisch"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2386
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing" label "Edit Fishing"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2387
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. group "Culture"
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2392
 msgid "Culture"
 msgstr "Kultuur"
 
 #. item "Culture/Museum"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2393
 msgid "Museum"
 msgstr "Museum"
@@ -26699 +27367 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
 #. item "Culture/Museum" label "Edit Museum"
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2395
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
 #. item "Culture/Theatre"
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2401
 msgid "Theatre"
 msgstr "Theater"
@@ -26711 +27379 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
 #. item "Culture/Theatre" label "Edit Theatre"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2404
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Culture/Library"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2408
 msgid "Library"
 msgstr "Bibliotheek"
@@ -26723 +27391 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
 #. item "Culture/Library" label "Edit Library"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2411
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
 #. item "Culture/Arts Centre"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2416
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -26734 +27402 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
 #. item "Culture/Arts Centre" label "Edit Arts Centre"
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2418
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Culture/Artwork"
-#: build/trans_presets.java:2288
+#: build/trans_presets.java:2422
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -26745 +27413 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
 #. item "Culture/Artwork" label "Edit Artwork"
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2424
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
 
 #. item "Culture/Place of Worship"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2428
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -26758 +27426 @@
 #. 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:2298
+#: build/trans_presets.java:2432
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -26765 +27433 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "Religion"
 msgstr "Religie"
@@ -26773 +27441 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "bahai"
 msgstr "Bahai"
@@ -26781 +27449 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "buddhist"
 msgstr "Boeddhisme"
@@ -26789 +27457 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "christian"
 msgstr "Christelijk"
@@ -26797 +27465 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "hindu"
 msgstr "Hindoestaans"
@@ -26805 +27473 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "jain"
 msgstr "Jain"
@@ -26813 +27481 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "jewish"
 msgstr "Joods"
@@ -26821 +27489 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "muslim"
 msgstr "Moslim"
@@ -26829 +27497 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "sikh"
 msgstr "Sikh"
@@ -26837 +27505 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "spiritualist"
 msgstr "Spirtualist"
@@ -26845 +27513 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "taoist"
 msgstr "Taoist"
@@ -26853 +27521 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "unitarian"
 msgstr ""
@@ -26861 +27529 @@
 #. item "Land use/Graveyard" combo "Religion" display value
 #. item "Land use/Cemetery" combo "Religion" display value
-#: build/trans_presets.java:2301 build/trans_presets.java:3976
-#: build/trans_presets.java:3985
+#: build/trans_presets.java:2435 build/trans_presets.java:4139
+#: build/trans_presets.java:4148
 msgid "zoroastrian"
 msgstr ""
@@ -26869 +27537 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "Denomination"
 msgstr "Benaming"
@@ -26877 +27545 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "anglican"
 msgstr "Anglicaan"
@@ -26885 +27553 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "baptist"
 msgstr "Baptist"
@@ -26893 +27561 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "catholic"
 msgstr "Katholiek"
@@ -26901 +27569 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "evangelical"
 msgstr "Evangelist"
@@ -26909 +27577 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
@@ -26917 +27585 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "lutheran"
 msgstr "Luthers"
@@ -26925 +27593 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "methodist"
 msgstr "Methodist"
@@ -26933 +27601 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "mormon"
 msgstr "Mormoon"
@@ -26941 +27609 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "orthodox"
 msgstr "Orthodox"
@@ -26949 +27617 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "pentecostal"
 msgstr ""
@@ -26957 +27625 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "presbyterian"
 msgstr ""
@@ -26965 +27633 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "protestant"
 msgstr "Protestant"
@@ -26973 +27641 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "quaker"
 msgstr "Quaker"
@@ -26981 +27649 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "shia"
 msgstr ""
@@ -26989 +27657 @@
 #. item "Land use/Graveyard" combo "Denomination" display value
 #. item "Land use/Cemetery" combo "Denomination" display value
-#: build/trans_presets.java:2302 build/trans_presets.java:3977
-#: build/trans_presets.java:3986
+#: build/trans_presets.java:2436 build/trans_presets.java:4140
+#: build/trans_presets.java:4149
 msgid "sunni"
 msgstr ""
 
+#. item "Culture/Place of Worship" combo "Service Times"
+#: build/trans_presets.java:2437
+#, fuzzy
+msgid "Service Times"
+msgstr "Diensten"
+
+#. item "Culture/Place of Worship" combo "Service Times" display value
+#: build/trans_presets.java:2437
+msgid "Su 10:00"
+msgstr ""
+
+#. item "Culture/Place of Worship" combo "Service Times" display value
+#: build/trans_presets.java:2437
+msgid "Su 10:30"
+msgstr ""
+
+#. item "Culture/Place of Worship" combo "Service Times" display value
+#: build/trans_presets.java:2437
+msgid "Su 11:00"
+msgstr ""
+
+#. item "Culture/Place of Worship" combo "Opening Hours for visiting"
+#: build/trans_presets.java:2438
+#, fuzzy
+msgid "Opening Hours for visiting"
+msgstr "Openingstijden"
+
 #. item "Culture/Recording Studio"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2440
 msgid "Recording Studio"
 msgstr "Opnamestudio"
@@ -27001 +27696 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
 #. item "Culture/Recording Studio" label "Edit Studio"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2442
 msgid "Edit Studio"
 msgstr "Wijzig Opnamestudio"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2447
 msgid "audio"
 msgstr "audio"
 
 #. item "Culture/Recording Studio" combo "Type" display value
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2447
 msgid "video"
 msgstr "video"
@@ -27017 +27712 @@
 #. group "Public Building"
 #. item "Public Building/Public Building"
-#: build/trans_presets.java:2317 build/trans_presets.java:2318
+#: build/trans_presets.java:2452 build/trans_presets.java:2453
 msgid "Public Building"
 msgstr "Openbaar gebouw"
@@ -27023 +27718 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
 #. item "Public Building/Public Building" label "Edit Public Building"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2455
 msgid "Edit Public Building"
 msgstr "Openbaar gebouw bewerken"
 
 #. item "Public Building/Town hall"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2459
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -27034 +27729 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
 #. item "Public Building/Town hall" label "Edit Town hall"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2461
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
@@ -27041 +27736 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre" />
 #. item "Public Building/Community Centre" label "Community Centre"
-#: build/trans_presets.java:2330 build/trans_presets.java:2332
+#: build/trans_presets.java:2465 build/trans_presets.java:2467
 msgid "Community Centre"
 msgstr "Gemeenschapscentrum"
 
 #. item "Public Building/Embassy"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2474
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27052 +27747 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
 #. item "Public Building/Embassy" label "Edit Embassy"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2476
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Public Building/Courthouse"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2480
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -27064 +27759 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
 #. item "Public Building/Courthouse" label "Edit Courthouse"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2483
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Public Building/Prison"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2487
 msgid "Prison"
 msgstr "Gevangenis"
@@ -27076 +27771 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
 #. item "Public Building/Prison" label "Edit Prison"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2490
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Public Building/Police"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2494
 msgid "Police"
 msgstr "Politie"
@@ -27089 +27784 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
 #. item "Public Building/Police" label "Edit Police"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2498
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Public Building/Fire Station"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2502
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -27101 +27796 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
 #. item "Public Building/Fire Station" label "Edit Fire Station"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2505
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Public Building/Post Office"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2509
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -27112 +27807 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
 #. item "Public Building/Post Office" label "Edit Post Office"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2511
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
 
 #. group "Education"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2517
 msgid "Education"
 msgstr "Opvoeding"
 
 #. item "Education/Kindergarten"
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2518
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Education/Kindergarten" label "Edit Kindergarten"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2519
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Education/School"
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2523
 msgid "School"
 msgstr "School"
@@ -27138 +27833 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
 #. item "Education/School" label "Edit School"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2525
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Education/University"
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2529
 msgid "University"
 msgstr "Universiteit"
@@ -27149 +27844 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
 #. item "Education/University" label "Edit University"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2531
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Education/College"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2535
 msgid "College"
 msgstr "Campus"
@@ -27160 +27855 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
 #. item "Education/College" label "Edit College"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2537
 msgid "Edit College"
 msgstr "Campus bewerken"
 
 #. item "Education/Driving School"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2541
 msgid "Driving School"
 msgstr "Rijschool"
@@ -27171 +27866 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
 #. item "Education/Driving School" label "Edit Driving School"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2543
 msgid "Edit Driving School"
 msgstr "Wijzig rijschool"
 
 #. item "Education/Driving School" text "License Classes"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2548
 msgid "License Classes"
 msgstr "Rijbewijsopleiding"
 
 #. group "Health"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2551
 msgid "Health"
 msgstr "Gezondheid"
 
+#. item "Health/Hospital"
+#: build/trans_presets.java:2552
+msgid "Hospital"
+msgstr "Ziekenhuis"
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#. item "Health/Hospital" label "Edit Hospital"
+#: build/trans_presets.java:2554
+msgid "Edit Hospital"
+msgstr "Ziekenhuis bewerken"
+
 #. item "Health/Doctors"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2558
 msgid "Doctors"
 msgstr "Huisarts"
@@ -27192 +27898 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
 #. item "Health/Doctors" label "Edit Doctors"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2560
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2565
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist" label "Edit Dentist"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2566
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
+#. item "Health/Nursing Home"
+#: build/trans_presets.java:2571
+#, fuzzy
+msgid "Nursing Home"
+msgstr "Nummeringschema"
+
+#. item "Health/Nursing Home" label "Edit Nursing Home"
+#: build/trans_presets.java:2572
+#, fuzzy
+msgid "Edit Nursing Home"
+msgstr "Wijzig Oversteekplaats"
+
+#. <separator/>
 #. item "Health/Pharmacy"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2578
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -27213 +27932 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
 #. item "Health/Pharmacy" label "Edit Pharmacy"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2580
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -27219 +27938 @@
 #. <key key="amenity" value="pharmacy" />
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2582
 msgid "Dispensing"
 msgstr "Aflevering"
 
 #. item "Health/Hearing Aids"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2586
 msgid "Hearing Aids"
 msgstr "Hoorapparaten"
@@ -27230 +27949 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
 #. item "Health/Hearing Aids" label "Edit Hearing Aids"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2588
 msgid "Edit Hearing Aids"
 msgstr "Wijzig Hoorapparaten"
 
-#. item "Health/Hospital"
-#: build/trans_presets.java:2447
-msgid "Hospital"
-msgstr "Ziekenhuis"
-
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#. item "Health/Hospital" label "Edit Hospital"
-#: build/trans_presets.java:2449
-msgid "Edit Hospital"
-msgstr "Ziekenhuis bewerken"
-
+#. <separator/>
 #. item "Health/Baby Hatch"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2596
 msgid "Baby Hatch"
 msgstr "Vondelingenschuif"
@@ -27252 +27961 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
 #. item "Health/Baby Hatch" label "Edit Baby Hatch"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2598
 msgid "Edit Baby Hatch"
 msgstr "Wijzig Vondelingenschuif"
 
+#. <separator/>
 #. item "Health/Emergency Access Point"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2604
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -27264 +27974 @@
 #. 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:2463
+#: build/trans_presets.java:2607
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -27271 +27981 @@
 #. <key key="highway" value="emergency_access_point" />
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2610
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2611
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2614
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
 
 #. <space />
+#. <separator/>
 #. item "Health/Veterinary"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2618
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -27294 +28005 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
 #. item "Health/Veterinary" label "Edit Veterinary"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2621
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
 #. item "Facilities/Toilets" combo "Wheelchair" display value
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2635
 msgid "limited"
 msgstr "beperkt"
@@ -27305 +28016 @@
 #. item "Facilities/Toilets" text "Note"
 #. item "Vending machine" text "Note"
-#: build/trans_presets.java:2491 build/trans_presets.java:3653
+#: build/trans_presets.java:2636 build/trans_presets.java:3809
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Facilities/Post Box"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2638
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Facilities/Telephone"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2643
 msgid "Telephone"
 msgstr "Telefoon"
@@ -27322 +28033 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
 #. item "Facilities/Telephone" label "Edit Telephone"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2646
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
 
 #. item "Facilities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2654
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Facilities/Clock"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2656
 msgid "Clock"
 msgstr "Klok"
@@ -27339 +28050 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock" />
 #. item "Facilities/Clock" label "Edit Clock"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2659
 msgid "Edit Clock"
 msgstr "Wijzig Klok"
@@ -27347 +28058 @@
 #. item "Facilities/Clock" combo "Display"
 #. item "Man Made/Man Made/Measurement Station" combo "Display"
-#: build/trans_presets.java:2517 build/trans_presets.java:3081
+#: build/trans_presets.java:2662 build/trans_presets.java:3226
 msgid "Display"
 msgstr "Scherm"
@@ -27353 +28064 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2517 build/trans_presets.java:3081
+#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#, fuzzy
+msgctxt "display"
 msgid "analog"
 msgstr "analoog"
@@ -27359 +28072 @@
 #. item "Facilities/Clock" combo "Display" display value
 #. item "Man Made/Man Made/Measurement Station" combo "Display" display value
-#: build/trans_presets.java:2517 build/trans_presets.java:3081
+#: build/trans_presets.java:2662 build/trans_presets.java:3226
+#, fuzzy
+msgctxt "display"
 msgid "digital"
 msgstr "digitaal"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2662
+#, fuzzy
+msgctxt "display"
 msgid "sundial"
 msgstr "zonnewijzer"
 
 #. item "Facilities/Clock" combo "Display" display value
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2662
+#, fuzzy
+msgctxt "display"
 msgid "unorthodox"
 msgstr "ongewoon"
 
 #. item "Facilities/Clock" combo "Support"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "Support"
 msgstr "Draagsteun"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "pole"
 msgstr "paal"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "wall_mounted"
 msgstr "wand"
 
 #. item "Facilities/Clock" combo "Support" display value
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2663
 msgid "billboard"
 msgstr "reklamepaneel"
 
 #. item "Facilities/Clock" combo "Visibility/readability"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "Visibility/readability"
 msgstr "Zichtbaarheid/leesbaarheid"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "(up to 5m)"
 msgstr "(tot 5 m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "(up to 20m)"
 msgstr "(tot 20m)"
 
 #. item "Facilities/Clock" combo "Visibility/readability" display value
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2664
 msgid "(more than 20m)"
 msgstr "(meer dan 20m)"
 
 #. item "Facilities/Clock" check "Shows current date"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2665
 msgid "Shows current date"
 msgstr "Toont datum"
 
 #. item "Facilities/Clock" check "Shows temperature"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2666
 msgid "Shows temperature"
 msgstr "Toont temperatuur"
 
 #. item "Facilities/Clock" check "Shows barometric pressure"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2667
 msgid "Shows barometric pressure"
 msgstr "Toont luchtdruk"
 
 #. item "Facilities/Clock" check "Shows humidity"
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2668
 msgid "Shows humidity"
 msgstr "Toont luchtvochtigheid"
@@ -27435 +28154 @@
 #. </optional>
 #. item "Facilities/Recycling"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2671
 msgid "Recycling"
 msgstr "Recycling"
@@ -27442 +28161 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
 #. item "Facilities/Recycling" label "Edit Recycling station"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2674
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -27448 +28167 @@
 #. <key key="amenity" value="recycling" />
 #. item "Facilities/Recycling" check "Batteries"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2676
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Facilities/Recycling" check "Cans"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2677
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Facilities/Recycling" check "Glass"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2679
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Facilities/Recycling" check "Paper"
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2680
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Facilities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2681
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2682
 msgid "container"
 msgstr ""
 
 #. item "Facilities/Recycling" combo "Type" display value
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2682
 msgid "centre"
 msgstr ""
 
 #. item "Facilities/Waste Basket"
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2684
 msgid "Waste Basket"
 msgstr "Vuilbak"
@@ -27489 +28208 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
 #. item "Facilities/Waste Basket" label "Edit Waste Basket"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2686
 msgid "Edit Waste Basket"
 msgstr "Wijzig Vuilbak"
@@ -27496 +28215 @@
 #. <key key="amenity" value="bench" />
 #. item "Facilities/Bench" combo "Backrest"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2693
 msgid "Backrest"
 msgstr ""
 
 #. item "Facilities/Bench" combo "Material"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2694
 msgid "Material"
 msgstr "Materiaal"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2694
 msgid "stone"
 msgstr "steen"
 
 #. item "Facilities/Bench" combo "Material" display value
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2694
 msgid "plastic"
 msgstr "plastiek"
 
 #. item "Facilities/Bench" combo "Colour"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgid "Colour"
 msgstr "Kleur"
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "black"
@@ -27527 +28246 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "brown"
@@ -27533 +28252 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "green"
@@ -27539 +28258 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "red"
@@ -27545 +28264 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "blue"
@@ -27551 +28270 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "gray"
@@ -27557 +28276 @@
 
 #. item "Facilities/Bench" combo "Colour" display value
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2695
 msgctxt "color"
 msgid "white"
@@ -27563 +28282 @@
 
 #. item "Facilities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2696
 msgid "Amount of Seats"
 msgstr "Aantal zitplaatsen"
 
 #. item "Facilities/Shelter" label "Edit Shelter"
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2699
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
 
 #. item "Facilities/Shelter" combo "Type of shelter"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgid "Type of shelter"
 msgstr ""
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "weather_shelter"
@@ -27584 +28303 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "public_transport"
@@ -27590 +28309 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "picnic_shelter"
@@ -27596 +28315 @@
 
 #. item "Facilities/Shelter" combo "Type of shelter" display value
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2703
 msgctxt "shelter"
 msgid "wildlife_hide"
@@ -27602 +28321 @@
 
 #. item "Facilities/Hunting Stand"
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2705
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Facilities/Hunting Stand" label "Edit Hunting Stand"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2706
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -27614 +28333 @@
 #. item "Facilities/Hunting Stand" combo "Height"
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:2563 build/trans_presets.java:3837
+#: build/trans_presets.java:2708 build/trans_presets.java:4000
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2708
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "low"
@@ -27625 +28344 @@
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2708
 msgid "half"
 msgstr "Bukhoogte"
 
 #. item "Facilities/Hunting Stand" combo "Height" display value
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2708
 msgid "full"
 msgstr "Stahoogte"
 
 #. item "Facilities/Hunting Stand" combo "Hide"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2710
 msgid "Hide"
 msgstr "Verborgen"
 
 #. item "Facilities/Hunting Stand" combo "Lock"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2711
 msgid "Lock"
 msgstr "Afgesloten"
@@ -27646 +28365 @@
 #. <separator/>
 #. item "Facilities/Drinking Water"
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2714
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -27653 +28372 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
 #. item "Facilities/Drinking Water" label "Edit Drinking Water"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2717
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Facilities/Fire Hydrant"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2721
 msgid "Fire Hydrant"
 msgstr "Brandkraan"
@@ -27665 +28384 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
 #. item "Facilities/Fire Hydrant" label "Edit Fire Hydrant"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2724
 msgid "Edit Fire Hydrant"
 msgstr "Wijzig Brandkraan"
@@ -27671 +28390 @@
 #. item "Facilities/Fire Hydrant" combo "Type" display value
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2581 build/trans_presets.java:2979
+#: build/trans_presets.java:2726 build/trans_presets.java:3124
 msgctxt "pipeline"
 msgid "underground"
@@ -27677 +28396 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2726
 msgctxt "pipeline"
 msgid "pillar"
@@ -27683 +28402 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2726
 msgctxt "pipeline"
 msgid "wall"
@@ -27689 +28408 @@
 
 #. item "Facilities/Fire Hydrant" combo "Type" display value
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2726
 msgctxt "pipeline"
 msgid "pond"
@@ -27695 +28414 @@
 
 #. item "Facilities/Fire Hydrant" combo "Diameter"
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2727
 msgid "Diameter"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "lane"
@@ -27706 +28425 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "parking_lot"
@@ -27712 +28431 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "sidewalk"
@@ -27718 +28437 @@
 
 #. item "Facilities/Fire Hydrant" combo "Position" display value
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2733
 msgctxt "hydrant position"
 msgid "green"
@@ -27724 +28443 @@
 
 #. item "Facilities/Fire Hydrant" combo "Pressure"
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2734
 msgid "Pressure"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2734
 msgid "xx l/min"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" combo "Pressure" display value
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2734
 msgid "suction"
 msgstr ""
 
 #. item "Facilities/Fire Hydrant" text "Count"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2735
 msgid "Count"
 msgstr ""
@@ -27745 +28464 @@
 #. group "Sports"
 #. item "Clothes/Sports"
-#: build/trans_presets.java:2594 build/trans_presets.java:3358
+#: build/trans_presets.java:2739 build/trans_presets.java:3514
 msgid "Sports"
 msgstr "Sporten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2740
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2741
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2742
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -27772 +28491 @@
 #. <space />
 #. item "Sports/Sport Facilities/Racetrack" label "select sport:"
-#: build/trans_presets.java:2601 build/trans_presets.java:2610
-#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2746 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2773
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -28117 +28836 @@
 #. <condition k="sport" v="rc_car"/>
 #. color sport
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 #: build/trans_style.java:3107 build/trans_style.java:3113
 #: build/trans_style.java:3119 build/trans_style.java:3125
@@ -28154 +28873 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "multi"
 msgstr "Meervoudig"
@@ -28163 +28882 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "archery"
 msgstr "Boogschieten"
@@ -28172 +28891 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "athletics"
 msgstr "Atletiek"
@@ -28181 +28900 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "american_football"
 msgstr ""
@@ -28190 +28909 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "australian_football"
 msgstr "Australisch football"
@@ -28199 +28918 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "baseball"
 msgstr "Honkbal"
@@ -28208 +28927 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "basketball"
 msgstr "Basketball"
@@ -28217 +28936 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "boules"
 msgstr "Boules"
@@ -28226 +28945 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "bowls"
 msgstr "Bowling"
@@ -28235 +28954 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "canadian_football"
 msgstr ""
@@ -28244 +28963 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "canoe"
 msgstr "Kanoën"
@@ -28253 +28972 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "climbing"
 msgstr "Klimmen"
@@ -28262 +28981 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "cricket"
 msgstr "Cricket"
@@ -28271 +28990 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "cricket_nets"
 msgstr "Cricket netten"
@@ -28280 +28999 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "croquet"
 msgstr "Croquet"
@@ -28289 +29008 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "cycling"
 msgstr "Fietsen"
@@ -28298 +29017 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "dog_racing"
 msgstr "Hondenraces"
@@ -28307 +29026 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "equestrian"
 msgstr "Paardensport"
@@ -28316 +29035 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "gaelic_football"
 msgstr ""
@@ -28325 +29044 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "golf"
 msgstr "Golf"
@@ -28334 +29053 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "gymnastics"
 msgstr "Turnen"
@@ -28343 +29062 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "hockey"
 msgstr "Hockey"
@@ -28352 +29071 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "horse_racing"
 msgstr "Paardenraces"
@@ -28361 +29080 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "motor"
 msgstr "Motorsport"
@@ -28370 +29089 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "pelota"
 msgstr "Pelota"
@@ -28379 +29098 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "racquet"
 msgstr "Badminton"
@@ -28388 +29107 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "rugby_league"
 msgstr ""
@@ -28397 +29116 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "rugby_union"
 msgstr ""
@@ -28406 +29125 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "shooting"
 msgstr "Schieten"
@@ -28415 +29134 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "skateboard"
 msgstr "Skateboarden"
@@ -28424 +29143 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "skating"
 msgstr "Schaatsen"
@@ -28433 +29152 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "skiing"
 msgstr "Skiën"
@@ -28442 +29161 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "soccer"
 msgstr "Voetbal"
@@ -28451 +29170 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "swimming"
 msgstr "Zwemmen"
@@ -28460 +29179 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "table_tennis"
 msgstr "Tafeltennis"
@@ -28469 +29188 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport" display value
 #. item "Sports/Sport Facilities/Racetrack" combo "sport" display value
-#: build/trans_presets.java:2603 build/trans_presets.java:2612
-#: build/trans_presets.java:2621 build/trans_presets.java:2630
+#: build/trans_presets.java:2748 build/trans_presets.java:2757
+#: build/trans_presets.java:2766 build/trans_presets.java:2775
 msgid "tennis"
 msgstr "Tennis"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2750
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2751
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2759
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2760
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2768
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2769
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2777
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2778
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2783
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2784
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
 #. group "Sport"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2790
 msgid "Sport"
 msgstr "Sport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2791
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi" label "Edit Multi"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2792
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -28581 +29300 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: 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:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: 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:2969
+#: build/trans_presets.java:2975 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:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "type"
 msgstr "soort"
@@ -28649 +29368 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2809
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: 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:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: 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:2954
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 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:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "pitch"
 msgstr "Sportveld"
@@ -28718 +29437 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2809
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: 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:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: 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:2954
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 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:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "sports_centre"
 msgstr "Sportcentrum"
@@ -28782 +29501 @@
 #. item "Sport (Ball)/Tennis" combo "type" display value
 #. item "Motorsport/Motorsport" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2809
-#: build/trans_presets.java:2818 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: 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:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: 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:2954
+#: build/trans_presets.java:2963 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 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:3037
 msgid "stadium"
 msgstr "Stadion"
@@ -28847 +29566 @@
 #. item "Motorsport/Model Aerodrome" combo "type" display value
 #. item "Motorsport/RC Car" combo "type" display value
-#: build/trans_presets.java:2650 build/trans_presets.java:2656
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2722 build/trans_presets.java:2728
-#: build/trans_presets.java:2737 build/trans_presets.java:2744
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2782
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2824
-#: build/trans_presets.java:2830 build/trans_presets.java:2836
-#: build/trans_presets.java:2842 build/trans_presets.java:2848
-#: build/trans_presets.java:2854 build/trans_presets.java:2860
-#: build/trans_presets.java:2866 build/trans_presets.java:2872
-#: build/trans_presets.java:2878 build/trans_presets.java:2884
-#: build/trans_presets.java:2892 build/trans_presets.java:2898
-#: build/trans_presets.java:2904 build/trans_presets.java:2910
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2795 build/trans_presets.java:2801
+#: 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:2882 build/trans_presets.java:2889
+#: build/trans_presets.java:2897 build/trans_presets.java:2903
+#: 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:2969
+#: build/trans_presets.java:2975 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:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3062 build/trans_presets.java:3068
 msgid "track"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2797
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin" label "Edit 10pin"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2798
 msgid "Edit 10pin"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2658
+#: build/trans_presets.java:2803
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics" label "Edit Athletics"
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2804
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2809
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery" label "Edit Archery"
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2810
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2815
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing" label "Edit Climbing"
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2816
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2821
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing" label "Edit Canoeing"
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2822
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling" label "Edit Cycling"
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2828
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2833
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing" label "Edit Dog Racing"
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2834
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2839
 msgid "Equestrian"
 msgstr "Paardensport"
 
 #. item "Sport/Equestrian" label "Edit Equestrian"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2840
 msgid "Edit Equestrian"
 msgstr "Wijzig Paardensport"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2845
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing" label "Edit Horse Racing"
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2846
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2851
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics" label "Edit Gymnastics"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2852
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2857
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating" label "Edit Skating"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2858
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2863
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard" label "Edit Skateboard"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2864
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2869
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming" label "Edit Swimming"
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2870
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -28998 +29717 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
 #. item "Sport/Skiing" label "Edit Skiing"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2877
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "downhill"
 msgstr "bergafwaarts"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "nordic"
 msgstr "Scandinavisch"
 
 #. item "Sport/Skiing" combo "Piste type" display value
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2880
 msgid "snow_park"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "novice"
 msgstr "beginner"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "easy"
 msgstr "eenvoudig"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "advanced"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "expert"
 msgstr "expert"
 
 #. item "Sport/Skiing" combo "Difficulty" display value
-#: build/trans_presets.java:2736
+#: build/trans_presets.java:2881
 msgid "freeride"
 msgstr ""
 
 #. item "Sport/Shooting"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2884
 msgid "Shooting"
 msgstr "Schieten"
@@ -29059 +29778 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
 #. item "Sport/Shooting" label "Edit Shooting"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2886
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2892
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2893
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2894
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2899
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2900
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2905
 msgid "American Football"
 msgstr "Amerikaans voetbal"
 
 #. item "Sport (Ball)/American Football" label "Edit American Football"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2906
 msgid "Edit American Football"
 msgstr "Wijzig Amerikaans voetbal"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2911
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2912
 msgid "Edit Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2917
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2918
 msgid "Edit Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2923
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2924
 msgid "Edit Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2929
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2930
 msgid "Edit Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2935
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2936
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2941
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball" label "Edit Basketball"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2942
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
 #. item "Sport (Ball)/Volleyball"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2947
 msgid "Volleyball"
 msgstr "Volleybal"
@@ -29165 +29884 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
 #. item "Sport (Ball)/Volleyball" label "Edit Volleyball"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2949
 msgid "Edit Volleyball"
 msgstr "Wijzig Volleybal"
 
 #. item "Sport (Ball)/Beachvolleyball"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2956
 msgid "Beachvolleyball"
 msgstr "Beachvolleybal"
@@ -29176 +29895 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
 #. item "Sport (Ball)/Beachvolleyball" label "Edit Beachvolleyball"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2958
 msgid "Edit Beachvolleyball"
 msgstr "Wijzig Beachvolleybal"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2965
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf" label "Edit Golf"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2966
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type" display value
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2969
 msgid "golf_course"
 msgstr "golfbaan"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2971
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule" label "Edit Boule"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2972
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2977
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls" label "Edit Bowls"
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2978
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2983
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket" label "Edit Cricket"
-#: build/trans_presets.java:2839
+#: build/trans_presets.java:2984
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2989
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2990
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2995
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet" label "Edit Croquet"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:2996
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:3001
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey" label "Edit Hockey"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:3002
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:3007
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota" label "Edit Pelota"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:3008
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:3013
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:3014
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:3019
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:3020
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:3025
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:3026
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
@@ -29297 +30016 @@
 #. group "Motorsport"
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2887 build/trans_presets.java:2888
+#: build/trans_presets.java:3032 build/trans_presets.java:3033
 msgid "Motorsport"
 msgstr "Motorsport"
 
 #. item "Motorsport/Motorsport" label "Edit Motorsport"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3034
 msgid "Edit Motorsport"
 msgstr "Wijzig Motorsport"
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:3039
 msgid "Karting"
 msgstr "Karting"
 
 #. item "Motorsport/Karting" label "Edit Karting"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:3040
 msgid "Edit Karting"
 msgstr "Wijzig Karting"
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:3045
 msgid "Motocross"
 msgstr "Motocross"
 
 #. item "Motorsport/Motocross" label "Edit Motocross"
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:3046
 msgid "Edit Motocross"
 msgstr "Wijzig Motocross"
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:3051
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training" label "Edit Safety Training"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:3052
 msgid "Edit Safety Training"
 msgstr ""
@@ -29338 +30057 @@
 #. <separator/>
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:3058
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome" label "Edit Model Aerodrome"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:3059
 msgid "Edit Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:3064
 msgid "RC Car"
 msgstr ""
 
 #. item "Motorsport/RC Car" label "Edit RC Car"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3065
 msgid "Edit RC Car"
 msgstr ""
@@ -29359 +30078 @@
 #. group "Man Made"
 #. group "Man Made/Man Made"
-#: build/trans_presets.java:2927 build/trans_presets.java:2928
+#: build/trans_presets.java:3072 build/trans_presets.java:3073
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. item "Man Made/Man Made/Building"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3074
 msgid "Building"
 msgstr "Gebouw"
@@ -29370 +30089 @@
 #. <key key="building" value="yes" />
 #. item "Man Made/Man Made/Tower"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3077
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Man Made/Tower" label "Edit Tower"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:3078
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3081
 msgid "Tower type"
 msgstr "Type mast"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3081
 msgid "communication"
 msgstr "kommunikatie"
 
 #. item "Man Made/Man Made/Tower" combo "Tower type" display value
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3081
 msgid "observation"
 msgstr "observatie"
@@ -29397 +30116 @@
 #. item "Man Made/Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Man Made/Chimney" text "Height (meters)"
-#: build/trans_presets.java:2938 build/trans_presets.java:2959
+#: build/trans_presets.java:3083 build/trans_presets.java:3104
 msgid "Height (meters)"
 msgstr "Hoogte (meter)"
@@ -29403 +30122 @@
 #. </optional>
 #. item "Man Made/Man Made/Flagpole"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3087
 msgid "Flagpole"
 msgstr "Vlaggemast"
@@ -29411 +30130 @@
 #. <separator/>
 #. item "Man Made/Man Made/Works"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:3092
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Man Made/Works" label "Edit Works"
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:3093
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Man Made/Chimney"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3097
 msgid "Chimney"
 msgstr "Schoorsteen"
@@ -29427 +30146 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
 #. item "Man Made/Man Made/Chimney" label "Edit Chimney"
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:3099
 msgid "Edit Chimney"
 msgstr "Wijzig Schoorsteen"
 
 #. item "Man Made/Man Made/Windmill"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:3106
 msgid "Windmill"
 msgstr "Windmolen"
@@ -29438 +30157 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
 #. item "Man Made/Man Made/Windmill" label "Edit Windmill"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3108
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Man Made/Gasometer"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3112
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Man Made/Gasometer" label "Edit Gasometer"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3113
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Man Made/Pipeline"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:3117
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -29460 +30179 @@
 #. 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:2975
+#: build/trans_presets.java:3120
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
@@ -29502 +30221 @@
 #. <icon src="misc/coastline.png"/>
 #. color water
-#: build/trans_presets.java:2978 build/trans_style.java:817
+#: build/trans_presets.java:3123 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
@@ -29513 +30232 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:2978 build/trans_presets.java:3104
+#: build/trans_presets.java:3123 build/trans_presets.java:3250
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:3123
 msgid "heat"
 msgstr "warmte"
@@ -29524 +30243 @@
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:2978 build/trans_presets.java:3104
+#: build/trans_presets.java:3123 build/trans_presets.java:3250
 msgid "oil"
 msgstr "olie"
 
 #. item "Man Made/Man Made/Pipeline" combo "Type" display value
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:3123
 msgid "sewage"
 msgstr "afvalwater"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3124
 msgid "Location"
 msgstr "Locatie"
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3124
 msgctxt "pipeline"
 msgid "underwater"
@@ -29545 +30264 @@
 
 #. item "Man Made/Man Made/Pipeline" combo "Location" display value
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3124
 msgctxt "pipeline"
 msgid "overground"
@@ -29551 +30270 @@
 
 #. item "Man Made/Man Made/Crane"
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:3126
 msgid "Crane"
 msgstr "Kraan"
@@ -29557 +30276 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
 #. item "Man Made/Man Made/Crane" label "Edit Crane"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3128
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
 #. item "Man Made/Man Made/Mineshaft"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:3132
 msgid "Mineshaft"
 msgstr "Mijnschacht"
@@ -29569 +30288 @@
 #. 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:2990
+#: build/trans_presets.java:3135
 msgid "Edit Mineshaft"
 msgstr "Wijzig Mijnschacht"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3138
 msgid "Function"
 msgstr "Werking"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3138
 msgid "winding"
 msgstr "ondergronds"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Function" display value
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3138
 msgid "air"
 msgstr "openlucht"
 
 #. item "Man Made/Man Made/Mineshaft" text "Depth in meters"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3139
 msgid "Depth in meters"
 msgstr "Diepte in meter"
@@ -29595 +30314 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource"
 #. item "Man Made/Man Made/Adit" combo "Resource"
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "Resource"
 msgstr "Delfstof"
@@ -29601 +30320 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "aggregate"
 msgstr "zand_steenslag"
@@ -29607 +30326 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "bauxite"
 msgstr "bauxiet_(aluminium)"
@@ -29614 +30333 @@
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
+#: build/trans_presets.java:3250
 msgid "coal"
 msgstr "kolen"
@@ -29621 +30340 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "copper"
 msgstr "koper"
@@ -29627 +30346 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "dimension_stone"
 msgstr "natuursteen"
@@ -29633 +30352 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "gold"
 msgstr "goud"
@@ -29639 +30358 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "ilmenite"
 msgstr "ilmeniet_(ijzertitanaat)"
@@ -29645 +30364 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "iron_ore"
 msgstr "ijzererts"
@@ -29651 +30370 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "lead"
 msgstr "lood"
@@ -29657 +30376 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "limestone"
 msgstr "kalksteen"
@@ -29663 +30382 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "nickel"
 msgstr "nikkel"
@@ -29669 +30388 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "rutile"
 msgstr "rutiel (titanium)"
@@ -29675 +30394 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "salt"
 msgstr "zout"
@@ -29681 +30400 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "silver"
 msgstr "zilver"
@@ -29687 +30406 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "tin"
 msgstr "tin"
@@ -29693 +30412 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "zinc"
 msgstr "zink"
@@ -29699 +30418 @@
 #. item "Man Made/Man Made/Mineshaft" combo "Resource" display value
 #. item "Man Made/Man Made/Adit" combo "Resource" display value
-#: build/trans_presets.java:2996 build/trans_presets.java:3007
+#: build/trans_presets.java:3141 build/trans_presets.java:3152
 msgid "zircon"
 msgstr "zirconium"
 
 #. item "Man Made/Man Made/Mineshaft" combo "Visible Headframe"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3142
 msgid "Visible Headframe"
 msgstr "Zichtbaar Schachtblok"
@@ -29710 +30429 @@
 #. item "Man Made/Man Made/Mineshaft" check "Disused"
 #. item "Man Made/Man Made/Adit" check "Disused"
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
+#: build/trans_presets.java:3143 build/trans_presets.java:3153
 msgid "Disused"
 msgstr "Buiten gebruik"
 
 #. item "Man Made/Man Made/Adit"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3145
 msgid "Adit"
 msgstr "Toegangstunnel"
@@ -29721 +30440 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit" />
 #. item "Man Made/Man Made/Adit" label "Edit Adit"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3147
 msgid "Edit Adit"
 msgstr "Wijzig Toegangstunnel"
 
 #. item "Man Made/Man Made/Adit" text "Length in meters"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3150
 msgid "Length in meters"
 msgstr "Lengte in meter"
@@ -29732 +30451 @@
 #. <separator/>
 #. item "Man Made/Man Made/Water Tower"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3156
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Man Made/Water Tower" label "Edit Water Tower"
-#: build/trans_presets.java:3012
+#: build/trans_presets.java:3157
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Man Made/Water Works"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3161
 msgid "Water Works"
 msgstr "Waterwerken"
@@ -29748 +30467 @@
 #. <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:3018
+#: build/trans_presets.java:3163
 msgid "Edit Water Works"
 msgstr "Wijzig Waterwerken"
 
 #. item "Man Made/Man Made/Wastewater Plant"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3169
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -29761 +30480 @@
 #. 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:3028
+#: build/trans_presets.java:3173
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Man Made/Watermill"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3177
 msgid "Watermill"
 msgstr "Watermolen"
@@ -29772 +30491 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
 #. item "Man Made/Man Made/Watermill" label "Edit Watermill"
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3179
 msgid "Edit Watermill"
 msgstr "Wijzig Watermolen"
 
 #. item "Man Made/Man Made/Fountain"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3184
 msgid "Fountain"
 msgstr "Fontein"
@@ -29784 +30503 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
 #. item "Man Made/Man Made/Fountain" label "Edit Fountain"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3187
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Man Made/Man Made/Water Well"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3191
 msgid "Water Well"
 msgstr "Waterbron"
@@ -29795 +30514 @@
 #. <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:3048
+#: build/trans_presets.java:3193
 msgid "Edit Water Well"
 msgstr "Wijzig Waterbron"
@@ -29801 +30520 @@
 #. <separator/>
 #. item "Man Made/Man Made/Lighthouse"
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3198
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -29807 +30526 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
 #. item "Man Made/Man Made/Lighthouse" label "Edit Lighthouse"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3200
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
@@ -29813 +30532 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
 #. item "Man Made/Man Made/Beacon" label "Edit Beacon"
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3206
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Man Made/Street Lamp"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3210
 msgid "Street Lamp"
 msgstr "Straatlamp"
@@ -29824 +30543 @@
 #. <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:3067
+#: build/trans_presets.java:3212
 msgid "Edit Street Lamp"
 msgstr "Wijzig Straatlamp"
@@ -29831 +30550 @@
 #. <key key="highway" value="street_lamp" />
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3215
 msgid "Operation times"
 msgstr "Brandtijden"
 
 #. item "Man Made/Man Made/Street Lamp" combo "Operation times" display value
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3215
 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:3072
+#: build/trans_presets.java:3217
 msgid "Measurement Station"
 msgstr "Meetstation"
@@ -29847 +30566 @@
 #. <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:3074
+#: build/trans_presets.java:3219
 msgid "Edit Measurement Station"
 msgstr "Wijzig Meetstation"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "Measurement"
 msgstr "Meting"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "particulate_matter"
 msgstr "fijnstof"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "seismic"
 msgstr "aardbevingen"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "water_level"
 msgstr "waterniveau"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Measurement" display value
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3224
 msgid "weather"
 msgstr "weer"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "Recording"
 msgstr "Opname"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "manually"
 msgstr "handmatig"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "automated"
 msgstr "automatisch"
 
 #. item "Man Made/Man Made/Measurement Station" combo "Recording" display value
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3225
 msgid "remote"
 msgstr "van op afstand"
 
+#. item "Man Made/Man Made/Measurement Station" combo "Display" display value
+#: build/trans_presets.java:3226
+#, fuzzy
+msgctxt "display"
+msgid "no"
+msgstr "nee"
+
 #. item "Man Made/Man Made/Survey Point"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3228
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -29903 +30629 @@
 #. <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:3085
+#: build/trans_presets.java:3230
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Man Made/Surveillance"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3234
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -29914 +30640 @@
 #. <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:3091
+#: build/trans_presets.java:3236
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3239
 msgid "indoor"
 msgstr "binnenshuis"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3239
 msgid "outdoor"
 msgstr "buiten"
 
 #. item "Man Made/Man Made/Surveillance" combo "Type" display value
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3239
 msgid "public"
 msgstr "Openbaar"
 
 #. group "Power"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3242
 msgid "Power"
 msgstr "Energie"
 
 #. item "Power/Power Generator"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3243
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -29947 +30673 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
 #. item "Power/Power Generator" label "Edit Power Generator"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3247
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3250
+msgid "biofuel"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "biogas"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "biomass"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "diesel"
+msgstr "Diesel"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "gasoline"
+msgstr "Kustlijn"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "geothermal"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "hydro"
+msgstr "water"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "nuclear"
+msgstr "nucleair"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "osmotic"
+msgstr "aankondigingen"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "solar"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+#, fuzzy
+msgid "tidal"
+msgstr "slik"
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "waste"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
+msgid "wave"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Source" display value
+#: build/trans_presets.java:3250
 msgid "wind"
 msgstr "wind"
 
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "hydro"
-msgstr "water"
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "solar"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "nuclear"
-msgstr "nucleair"
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "fossil"
-msgstr "fossiele brandstoffen"
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "biofuel"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "waste"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "biomass"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "geothermal"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Source" display value
-#: build/trans_presets.java:3104
-msgid "biogas"
-msgstr ""
-
 #. item "Power/Power Generator" combo "Method"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3251
 msgid "Method"
 msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3251
+msgid "anaerobic_digestion"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "combustion"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+#, fuzzy
+msgid "dam"
+msgstr "Dam"
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "fission"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+#, fuzzy
+msgid "fusion"
+msgstr "Versie"
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "gasification"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "combustion"
-msgstr ""
+#: build/trans_presets.java:3251
+#, fuzzy
+msgid "pumped-storage"
+msgstr "Laadstroom"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "fission"
-msgstr ""
+#: build/trans_presets.java:3251
+#, fuzzy
+msgid "pumping"
+msgstr "Camping"
 
 #. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3251
+msgid "pyrolysis"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
+msgid "run-of-the-river"
+msgstr ""
+
+#. item "Power/Power Generator" combo "Method" display value
+#: build/trans_presets.java:3251
 msgid "thermal"
 msgstr ""
 
-#. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "gasification"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "wind_turbine"
-msgstr ""
-
-#. item "Power/Power Generator" combo "Method" display value
-#: build/trans_presets.java:3105
-msgid "anaerobic_digestion"
+#. <space />
+#. item "Power/Power Generator" label "Output forms of energy"
+#: build/trans_presets.java:3253
+msgid "Output forms of energy"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity"
+#: build/trans_presets.java:3254
+#, fuzzy
+msgid "electricity"
+msgstr "elektrisch"
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "2 W"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "3 kW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "5 MW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "electricity" display value
+#. item "Power/Power Generator" combo "hot water" display value
+#. item "Power/Power Generator" combo "hot air" display value
+#. item "Power/Power Generator" combo "cold water" display value
+#. item "Power/Power Generator" combo "cold air" display value
+#. item "Power/Power Generator" combo "compressed air" display value
+#. item "Power/Power Generator" combo "steam" display value
+#. item "Power/Power Generator" combo "vacuum" display value
+#. item "Power/Power Generator" combo "battery charging" display value
+#: build/trans_presets.java:3254 build/trans_presets.java:3255
+#: build/trans_presets.java:3256 build/trans_presets.java:3257
+#: build/trans_presets.java:3258 build/trans_presets.java:3259
+#: build/trans_presets.java:3260 build/trans_presets.java:3261
+#: build/trans_presets.java:3262
+msgid "7 GW"
+msgstr ""
+
+#. item "Power/Power Generator" combo "hot water"
+#: build/trans_presets.java:3255
+#, fuzzy
+msgid "hot water"
+msgstr "water"
+
+#. item "Power/Power Generator" combo "hot air"
+#: build/trans_presets.java:3256
+msgid "hot air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "cold water"
+#: build/trans_presets.java:3257
+#, fuzzy
+msgid "cold water"
+msgstr "water"
+
+#. item "Power/Power Generator" combo "cold air"
+#: build/trans_presets.java:3258
+msgid "cold air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "compressed air"
+#: build/trans_presets.java:3259
+msgid "compressed air"
+msgstr ""
+
+#. item "Power/Power Generator" combo "steam"
+#: build/trans_presets.java:3260
+msgid "steam"
+msgstr ""
+
+#. item "Power/Power Generator" combo "vacuum"
+#: build/trans_presets.java:3261
+msgid "vacuum"
+msgstr ""
+
+#. item "Power/Power Generator" combo "battery charging"
+#: build/trans_presets.java:3262
+msgid "battery charging"
 msgstr ""
 
 #. item "Power/Power Station"
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3264
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -30049 +30950 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Station" label "Edit Power Station"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3267
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Power/Power Sub Station"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3273
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -30061 +30962 @@
 #. 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:3120
+#: build/trans_presets.java:3276
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -30067 +30968 @@
 #. item "Power/Power Sub Station" text "Line reference"
 #. item "Power/Power Line" text "Line reference"
-#: build/trans_presets.java:3123 build/trans_presets.java:3156
+#: build/trans_presets.java:3279 build/trans_presets.java:3312
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Power/Cable Distribution Cabinet"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3281
 msgid "Cable Distribution Cabinet"
 msgstr "Verdeelkast"
@@ -30079 +30980 @@
 #. 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:3128
+#: build/trans_presets.java:3284
 msgid "Edit Cable Distribution Cabinet"
 msgstr "Wijzig verdeelkast"
@@ -30085 +30986 @@
 #. <separator/>
 #. item "Power/Power Tower"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3290
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -30094 +30995 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
 #. item "Power/Power Tower" label "Edit Power Tower"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3295
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
@@ -30100 +31001 @@
 #. <key key="power" value="tower" />
 #. item "Power/Power Tower" text "Tower reference"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3297
 msgid "Tower reference"
 msgstr "Referentie toren"
 
 #. item "Power/Pole"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3299
 msgid "Pole"
 msgstr "Mast"
@@ -30112 +31013 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power%3Dpole" />
 #. item "Power/Pole" label "Edit Power Pole"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3302
 msgid "Edit Power Pole"
 msgstr "Wijzig (hoogspannings)Mast"
@@ -30118 +31019 @@
 #. <key key="power" value="pole" />
 #. item "Power/Pole" text "Pole reference"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3304
 msgid "Pole reference"
 msgstr "Referentie mast"
 
 #. item "Power/Power Line"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3306
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -30130 +31031 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
 #. item "Power/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3309
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Power/Power Line" combo "Line type"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3310
 msgid "Line type"
 msgstr "Type lijn"
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3310
 msgctxt "Power Line"
 msgid "line"
@@ -30146 +31047 @@
 
 #. item "Power/Power Line" combo "Line type" display value
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3310
 msgctxt "Power Line"
 msgid "minor_line"
@@ -30152 +31053 @@
 
 #. item "Power/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3315
 msgid "Amount of Cables"
 msgstr "Aantal kabels"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 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:3160
+#: build/trans_presets.java:3316
 msgid "single"
 msgstr "enkel"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "double"
 msgstr "dubbel"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "triple"
 msgstr "drievoudig"
 
 #. item "Power/Power Line" combo "Number of wires (better: conductors) per power cable" display value
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3316
 msgid "quad"
 msgstr "viervoudig"
 
 #. group "Historic Places"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3319
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. item "Historic Places/Castle"
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3320
 msgid "Castle"
 msgstr "Kasteel"
@@ -30194 +31095 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
 #. item "Historic Places/Castle" label "Edit Castle"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3323
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3328
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins" label "Edit Ruins"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3329
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
 #. item "Historic Places/Archaeological Site"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3334
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -30216 +31117 @@
 #. 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:3181
+#: build/trans_presets.java:3337
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
 #. item "Historic Places/Battlefield"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3342
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -30227 +31128 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3344
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Palaeontological Site"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3348
 msgid "Palaeontological Site"
 msgstr "Paleontologische plaats"
@@ -30238 +31139 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3350
 msgid "Edit Palaeontological Site"
 msgstr "Wijzig Paleontologische plaats"
@@ -30244 +31145 @@
 #. <separator/>
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3355
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument" label "Edit Monument"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3356
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Memorial"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3360
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -30260 +31161 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3362
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:3210
+#: build/trans_presets.java:3366
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3367
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:3215
+#: build/trans_presets.java:3371
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3372
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:3220
+#: build/trans_presets.java:3376
 msgid "Boundary Stone"
 msgstr "Grenspaal"
 
 #. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3377
 msgid "Edit Boundary Stone"
 msgstr "Wijzig Grenspaal"
 
 #. group "Shops"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3383
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops/Food"
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:3384
 msgid "Food"
 msgstr "Voeding"
 
 #. item "Shops/Food/Supermarket"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3385
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Food/Supermarket" label "Edit Supermarket"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3386
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
 #. item "Shops/Food/Convenience Store"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3391
 msgid "Convenience Store"
 msgstr ""
@@ -30321 +31222 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
 #. item "Shops/Food/Convenience Store" label "Edit Convenience Store"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3393
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Food/Kiosk"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3398
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -30332 +31233 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
 #. item "Shops/Food/Kiosk" label "Edit Kiosk"
-#: build/trans_presets.java:3244
+#: build/trans_presets.java:3400
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
@@ -30338 +31239 @@
 #. <separator/>
 #. item "Shops/Food/Baker"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3406
 msgid "Baker"
 msgstr "Bakker"
@@ -30344 +31245 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
 #. item "Shops/Food/Baker" label "Edit Baker"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3408
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
 #. item "Shops/Food/Butcher"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3413
 msgid "Butcher"
 msgstr "Slager"
@@ -30355 +31256 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #. item "Shops/Food/Butcher" label "Edit Butcher"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3415
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
 #. item "Shops/Food/Seafood"
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3420
 msgid "Seafood"
 msgstr "Viswinkel"
@@ -30366 +31267 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"/>
 #. item "Shops/Food/Seafood" label "Edit Seafood"
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3422
 msgid "Edit Seafood"
 msgstr "Wijzig Viswinkel"
 
 #. item "Shops/Food/Deli (Fine Food)"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3429
 msgid "Deli (Fine Food)"
 msgstr "Deli (fijnkost)"
@@ -30377 +31278 @@
 #. <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:3275
+#: build/trans_presets.java:3431
 msgid "Edit Deli (Fine Food)"
 msgstr "Wijzig Deli (fijnkost)"
 
 #. item "Shops/Food/Confectionery"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3438
 msgid "Confectionery"
 msgstr ""
@@ -30388 +31289 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
 #. item "Shops/Food/Confectionery" label "Edit Confectionery"
-#: build/trans_presets.java:3284
+#: build/trans_presets.java:3440
 msgid "Edit Confectionery"
 msgstr ""
@@ -30394 +31295 @@
 #. <separator/>
 #. item "Shops/Food/Marketplace"
-#: build/trans_presets.java:3290
+#: build/trans_presets.java:3446
 msgid "Marketplace"
 msgstr "Markt"
@@ -30400 +31301 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
 #. item "Shops/Food/Marketplace" label "Edit Marketplace"
-#: build/trans_presets.java:3292
+#: build/trans_presets.java:3448
 msgid "Edit Marketplace"
 msgstr ""
 
 #. item "Shops/Food/Greengrocer"
-#: build/trans_presets.java:3299
+#: build/trans_presets.java:3455
 msgid "Greengrocer"
 msgstr "Groentewinkel"
@@ -30411 +31312 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"/>
 #. item "Shops/Food/Greengrocer" label "Edit Greengrocer"
-#: build/trans_presets.java:3301
+#: build/trans_presets.java:3457
 msgid "Edit Greengrocer"
 msgstr "Wijzig Groentewinkel"
 
 #. item "Shops/Food/Organic"
-#: build/trans_presets.java:3308
+#: build/trans_presets.java:3464
 msgid "Organic"
 msgstr "Biowinkel"
 
 #. item "Shops/Food/Organic" label "Edit Organic Shop"
-#: build/trans_presets.java:3309
+#: build/trans_presets.java:3465
 msgid "Edit Organic Shop"
 msgstr "Wijzig Biowinkel"
@@ -30427 +31328 @@
 #. <separator/>
 #. item "Shops/Food/Alcohol"
-#: build/trans_presets.java:3315
+#: build/trans_presets.java:3471
 msgid "Alcohol"
 msgstr ""
@@ -30433 +31334 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
 #. item "Shops/Food/Alcohol" label "Edit Alcohol Shop"
-#: build/trans_presets.java:3317
+#: build/trans_presets.java:3473
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Food/Beverages"
-#: build/trans_presets.java:3322
+#: build/trans_presets.java:3478
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item "Shops/Food/Beverages" label "Edit Beverages Shop"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3479
 msgid "Edit Beverages Shop"
 msgstr "Wijzig Drankenhandel"
 
 #. item "Clothes/Clothes" label "Edit Clothes Shop"
-#: build/trans_presets.java:3331
+#: build/trans_presets.java:3487
 msgid "Edit Clothes Shop"
 msgstr "Wijzig Kledingwinkel"
 
 #. item "Clothes/Boutique"
-#: build/trans_presets.java:3336
+#: build/trans_presets.java:3492
 msgid "Boutique"
 msgstr "Boetiek"
@@ -30459 +31360 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
 #. item "Clothes/Boutique" label "Edit Boutique"
-#: build/trans_presets.java:3338
+#: build/trans_presets.java:3494
 msgid "Edit Boutique"
 msgstr "Wijzig Boetiek"
 
 #. item "Clothes/Shoes"
-#: build/trans_presets.java:3345
+#: build/trans_presets.java:3501
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Clothes/Shoes" label "Edit Shoe Shop"
-#: build/trans_presets.java:3346
+#: build/trans_presets.java:3502
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
 #. item "Clothes/Outdoor"
-#: build/trans_presets.java:3351
+#: build/trans_presets.java:3507
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -30480 +31381 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
 #. item "Clothes/Outdoor" label "Edit Outdoor Shop"
-#: build/trans_presets.java:3353
+#: build/trans_presets.java:3509
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Clothes/Sports" label "Edit Sports Shop"
-#: build/trans_presets.java:3359
+#: build/trans_presets.java:3515
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
@@ -30491 +31392 @@
 #. <separator/>
 #. item "Clothes/Dry Cleaning"
-#: build/trans_presets.java:3365
+#: build/trans_presets.java:3521
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -30497 +31398 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
 #. item "Clothes/Dry Cleaning" label "Edit Dry Cleaning"
-#: build/trans_presets.java:3367
+#: build/trans_presets.java:3523
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
 #. item "Clothes/Laundry"
-#: build/trans_presets.java:3372
+#: build/trans_presets.java:3528
 msgid "Laundry"
 msgstr "Wasserette"
@@ -30508 +31409 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
 #. item "Clothes/Laundry" label "Edit Laundry"
-#: build/trans_presets.java:3374
+#: build/trans_presets.java:3530
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
 #. item "Clothes/Tailor"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3535
 msgid "Tailor"
 msgstr "Kleermaker"
 
 #. item "Clothes/Tailor" label "Edit Tailor"
-#: build/trans_presets.java:3380
+#: build/trans_presets.java:3536
 msgid "Edit Tailor"
 msgstr "Wijzig Kleermaker"
 
 #. item "Clothes/Fabric"
-#: build/trans_presets.java:3385
+#: build/trans_presets.java:3541
 msgid "Fabric"
 msgstr "Stoffen"
@@ -30529 +31430 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
 #. item "Clothes/Fabric" label "Edit Fabric"
-#: build/trans_presets.java:3387
+#: build/trans_presets.java:3543
 msgid "Edit Fabric"
 msgstr "Wijzig Stoffen"
 
 #. group "Electronic"
-#: build/trans_presets.java:3395
+#: build/trans_presets.java:3551
 msgid "Electronic"
 msgstr "Elektronika"
 
 #. item "Electronic/Computer"
-#: build/trans_presets.java:3396
+#: build/trans_presets.java:3552
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Electronic/Computer" label "Edit Computer Shop"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3553
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
 #. item "Electronic/Electronics"
-#: build/trans_presets.java:3402
+#: build/trans_presets.java:3558
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Electronic/Electronics" label "Edit Electronics Shop"
-#: build/trans_presets.java:3403
+#: build/trans_presets.java:3559
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
 #. item "Electronic/Mobile Phone"
-#: build/trans_presets.java:3408
+#: build/trans_presets.java:3564
 msgid "Mobile Phone"
 msgstr "Mobiele telefoons"
@@ -30565 +31466 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
 #. item "Electronic/Mobile Phone" label "Edit Mobile Phone"
-#: build/trans_presets.java:3410
+#: build/trans_presets.java:3566
 msgid "Edit Mobile Phone"
 msgstr "Wijzig Mobiele telefoons"
 
 #. item "Electronic/Vacuum Cleaner"
-#: build/trans_presets.java:3417
+#: build/trans_presets.java:3573
 msgid "Vacuum Cleaner"
 msgstr "Stofzuigers"
@@ -30576 +31477 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
 #. item "Electronic/Vacuum Cleaner" label "Edit Vacuum Cleaner"
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3575
 msgid "Edit Vacuum Cleaner"
 msgstr "Wijzig Stofzuiger"
 
 #. item "Electronic/Hifi"
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:3582
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Electronic/Hifi" label "Edit Hifi Shop"
-#: build/trans_presets.java:3427
+#: build/trans_presets.java:3583
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
 #. item "Electronic/Video"
-#: build/trans_presets.java:3432
+#: build/trans_presets.java:3588
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Electronic/Video" label "Edit Video Shop"
-#: build/trans_presets.java:3433
+#: build/trans_presets.java:3589
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
 #. group "Cash"
-#: build/trans_presets.java:3439
+#: build/trans_presets.java:3595
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. item "Cash/Bank"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3596
 msgid "Bank"
 msgstr "Bank"
@@ -30612 +31513 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
 #. item "Cash/Bank" label "Edit Bank"
-#: build/trans_presets.java:3442
+#: build/trans_presets.java:3598
 msgid "Edit Bank"
 msgstr "Bank bewerken"
@@ -30618 +31519 @@
 #. item "Cash/Bank" check "Automated Teller Machine"
 #. item "Cash/Automated Teller Machine"
-#: build/trans_presets.java:3447 build/trans_presets.java:3456
+#: build/trans_presets.java:3603 build/trans_presets.java:3612
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Money Exchange"
-#: build/trans_presets.java:3449
+#: build/trans_presets.java:3605
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -30629 +31530 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
 #. item "Cash/Money Exchange" label "Edit Money Exchange"
-#: build/trans_presets.java:3451
+#: build/trans_presets.java:3607
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -30635 +31536 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
-#: build/trans_presets.java:3458
+#: build/trans_presets.java:3614
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Other/Department Store"
-#: build/trans_presets.java:3464
+#: build/trans_presets.java:3620
 msgid "Department Store"
 msgstr "Supermarkt"
@@ -30646 +31547 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
 #. item "Other/Department Store" label "Edit Department Store"
-#: build/trans_presets.java:3466
+#: build/trans_presets.java:3622
 msgid "Edit Department Store"
 msgstr "Wijzig Supermarkt"
 
 #. item "Other/Mall"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3629
 msgid "Mall"
 msgstr "Winkelcentrum"
@@ -30657 +31558 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
 #. item "Other/Mall" label "Edit Mall"
-#: build/trans_presets.java:3475
+#: build/trans_presets.java:3631
 msgid "Edit Mall"
 msgstr "Wijzig Winkelcentrum"
@@ -30663 +31564 @@
 #. <separator/>
 #. item "Other/Chemist"
-#: build/trans_presets.java:3483
+#: build/trans_presets.java:3639
 msgid "Chemist"
 msgstr "Drogisterij"
 
 #. item "Other/Chemist" label "Edit Chemist"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3640
 msgid "Edit Chemist"
 msgstr "Wijzig Drogisterij"
 
 #. item "Other/Hairdresser"
-#: build/trans_presets.java:3489
+#: build/trans_presets.java:3645
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Other/Hairdresser" label "Edit Hairdresser"
-#: build/trans_presets.java:3490
+#: build/trans_presets.java:3646
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
 #. item "Other/Optician"
-#: build/trans_presets.java:3495
+#: build/trans_presets.java:3651
 msgid "Optician"
 msgstr "Optiek"
 
 #. item "Other/Optician" label "Edit Optician"
-#: build/trans_presets.java:3496
+#: build/trans_presets.java:3652
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
 #. item "Other/Jewelry"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3657
 msgid "Jewelry"
 msgstr "Juwelier"
@@ -30699 +31600 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
 #. item "Other/Jewelry" label "Edit Jewelry"
-#: build/trans_presets.java:3503
+#: build/trans_presets.java:3659
 msgid "Edit Jewelry"
 msgstr "Wijzig Juwelier"
 
 #. item "Other/Erotic"
-#: build/trans_presets.java:3510
+#: build/trans_presets.java:3666
 msgid "Erotic"
 msgstr "Erotiek"
@@ -30710 +31611 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"/>
 #. item "Other/Erotic" label "Edit Erotic"
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3668
 msgid "Edit Erotic"
 msgstr "Wijzig Erotiek"
@@ -30716 +31617 @@
 #. <separator/>
 #. item "Other/Florist"
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:3676
 msgid "Florist"
 msgstr "Bloemist"
@@ -30722 +31623 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
 #. item "Other/Florist" label "Edit Florist"
-#: build/trans_presets.java:3522
+#: build/trans_presets.java:3678
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
 #. item "Other/Garden Centre"
-#: build/trans_presets.java:3527
+#: build/trans_presets.java:3683
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -30733 +31634 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
 #. item "Other/Garden Centre" label "Edit Garden Centre"
-#: build/trans_presets.java:3529
+#: build/trans_presets.java:3685
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
@@ -30739 +31640 @@
 #. <separator/>
 #. item "Other/Do-it-yourself-store"
-#: build/trans_presets.java:3535
+#: build/trans_presets.java:3691
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -30745 +31646 @@
 #. <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:3537
+#: build/trans_presets.java:3693
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
 #. item "Other/Hardware"
-#: build/trans_presets.java:3542
+#: build/trans_presets.java:3698
 msgid "Hardware"
 msgstr "IJzerwaren"
@@ -30756 +31657 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
 #. item "Other/Hardware" label "Edit Hardware Store"
-#: build/trans_presets.java:3544
+#: build/trans_presets.java:3700
 msgid "Edit Hardware Store"
 msgstr "Wijzig IJzerwaren"
 
 #. item "Other/Paint"
-#: build/trans_presets.java:3549
+#: build/trans_presets.java:3705
 msgid "Paint"
 msgstr "Verven"
@@ -30767 +31668 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"/>
 #. item "Other/Paint" label "Edit Paint"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3707
 msgid "Edit Paint"
 msgstr "Wijzig Verven"
@@ -30773 +31674 @@
 #. <separator/>
 #. item "Other/Furniture"
-#: build/trans_presets.java:3559
+#: build/trans_presets.java:3715
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Other/Furniture" label "Edit Furniture Shop"
-#: build/trans_presets.java:3560
+#: build/trans_presets.java:3716
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
 #. item "Other/Kitchen"
-#: build/trans_presets.java:3565
+#: build/trans_presets.java:3721
 msgid "Kitchen"
 msgstr "Keukens"
@@ -30789 +31690 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"/>
 #. item "Other/Kitchen" label "Edit Kitchen"
-#: build/trans_presets.java:3567
+#: build/trans_presets.java:3723
 msgid "Edit Kitchen"
 msgstr "Wijzig Keukens"
 
 #. item "Other/Curtain"
-#: build/trans_presets.java:3574
+#: build/trans_presets.java:3730
 msgid "Curtain"
 msgstr "Gordijnen"
@@ -30800 +31701 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"/>
 #. item "Other/Curtain" label "Edit Curtain"
-#: build/trans_presets.java:3576
+#: build/trans_presets.java:3732
 msgid "Edit Curtain"
 msgstr "Wijzig Gordijnen"
 
 #. item "Other/Frame"
-#: build/trans_presets.java:3583
+#: build/trans_presets.java:3739
 msgid "Frame"
 msgstr ""
@@ -30811 +31712 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"/>
 #. item "Other/Frame" label "Edit Frames"
-#: build/trans_presets.java:3585
+#: build/trans_presets.java:3741
 msgid "Edit Frames"
 msgstr ""
@@ -30817 +31718 @@
 #. <separator/>
 #. item "Other/Stationery"
-#: build/trans_presets.java:3593
+#: build/trans_presets.java:3749
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Other/Stationery" label "Edit Stationery Shop"
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3750
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
 #. item "Other/Copyshop"
-#: build/trans_presets.java:3599
+#: build/trans_presets.java:3755
 msgid "Copyshop"
 msgstr "Copyshop"
@@ -30833 +31734 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"/>
 #. item "Other/Copyshop" label "Edit Copyshop"
-#: build/trans_presets.java:3601
+#: build/trans_presets.java:3757
 msgid "Edit Copyshop"
 msgstr "Wijzig Copyshop"
 
 #. item "Other/Book Store"
-#: build/trans_presets.java:3608
+#: build/trans_presets.java:3764
 msgid "Book Store"
 msgstr "Boekhandel"
 
 #. item "Other/Book Store" label "Edit Book Store"
-#: build/trans_presets.java:3609
+#: build/trans_presets.java:3765
 msgid "Edit Book Store"
 msgstr "Wijzig Boekhandel"
@@ -30849 +31750 @@
 #. <separator/>
 #. item "Other/Travel Agency"
-#: build/trans_presets.java:3615
+#: build/trans_presets.java:3771
 msgid "Travel Agency"
 msgstr "Reisagentschap"
 
 #. item "Other/Travel Agency" label "Edit Travel Agency"
-#: build/trans_presets.java:3616
+#: build/trans_presets.java:3772
 msgid "Edit Travel Agency"
 msgstr "Wijzig Reisagentschap"
 
 #. item "Other/Musical Instrument"
-#: build/trans_presets.java:3621
+#: build/trans_presets.java:3777
 msgid "Musical Instrument"
 msgstr "Muziekinstrumenten"
@@ -30865 +31766 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"/>
 #. item "Other/Musical Instrument" label "Edit Musical Instruments"
-#: build/trans_presets.java:3623
+#: build/trans_presets.java:3779
 msgid "Edit Musical Instruments"
 msgstr "Wijzig Muziekinstrumenten"
 
 #. item "Other/Toys"
-#: build/trans_presets.java:3630
+#: build/trans_presets.java:3786
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Other/Toys" label "Edit Toy Shop"
-#: build/trans_presets.java:3631
+#: build/trans_presets.java:3787
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
 #. item "Other/Variety Store"
-#: build/trans_presets.java:3636
+#: build/trans_presets.java:3792
 msgid "Variety Store"
 msgstr "Kruidenier"
@@ -30886 +31787 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"/>
 #. item "Other/Variety Store" label "Edit Variety Store"
-#: build/trans_presets.java:3638
+#: build/trans_presets.java:3794
 msgid "Edit Variety Store"
 msgstr "Wijzig Kruidenier"
 
 #. item "Vending machine"
-#: build/trans_presets.java:3646
+#: build/trans_presets.java:3802
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -30897 +31798 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
 #. item "Vending machine" label "Edit Vending machine"
-#: build/trans_presets.java:3648
+#: build/trans_presets.java:3804
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -30903 +31804 @@
 #. <key key="amenity" value="vending_machine" />
 #. item "Vending machine" multiselect "Vending products"
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "public_transport_plans"
 msgstr "overzichtskaart, plan"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "food"
 msgstr "voedsel"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "drinks"
 msgstr "frisdranken"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "sweets"
 msgstr "snoepgoed"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "cigarettes"
 msgstr "sigaretten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "photos"
 msgstr "foto’s"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "animal_food"
 msgstr "diervoeder"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "news_papers"
 msgstr "kranten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "toys"
 msgstr "speelgoed"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "stamps"
 msgstr "postzegels"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "bicycle_tube"
 msgstr ""
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "condoms"
 msgstr "condooms"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "tampons"
 msgstr "tampons"
 
 #. item "Vending machine" multiselect "Vending products" display value
-#: build/trans_presets.java:3650
+#: build/trans_presets.java:3806
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. group "Geography"
-#: build/trans_presets.java:3662 build/trans_presets.java:3779
+#: build/trans_presets.java:3818 build/trans_presets.java:3942
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3663
+#: build/trans_presets.java:3819
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3664
+#: build/trans_presets.java:3820
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Geography/Boundaries/National" label "Edit National Boundary"
-#: build/trans_presets.java:3665
+#: build/trans_presets.java:3821
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3670
+#: build/trans_presets.java:3826
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Geography/Boundaries/Administrative" label "Edit Administrative Boundary"
-#: build/trans_presets.java:3671
+#: build/trans_presets.java:3827
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3676
+#: build/trans_presets.java:3832
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Geography/Boundaries/Civil" label "Edit Civil Boundary"
-#: build/trans_presets.java:3677
+#: build/trans_presets.java:3833
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3682
+#: build/trans_presets.java:3838
 msgid "Political"
 msgstr "Politiek"
 
 #. item "Geography/Boundaries/Political" label "Edit Political Boundary"
-#: build/trans_presets.java:3683
+#: build/trans_presets.java:3839
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3688
+#: build/trans_presets.java:3844
 msgid "National park"
 msgstr "Nationaal park"
 
 #. item "Geography/Boundaries/National park" label "Edit National Park Boundary"
-#: build/trans_presets.java:3689
+#: build/trans_presets.java:3845
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. group "Places"
-#: build/trans_presets.java:3695
+#: build/trans_presets.java:3851
 msgid "Places"
 msgstr "Locaties"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3696
+#: build/trans_presets.java:3852
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Places/Continent" label "Edit Continent"
-#: build/trans_presets.java:3697
+#: build/trans_presets.java:3853
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3703
+#: build/trans_presets.java:3859
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 msgid "Country"
@@ -31084 +31985 @@
 
 #. item "Places/Country" label "Edit Country"
-#: build/trans_presets.java:3704
+#: build/trans_presets.java:3860
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Places/State"
-#: build/trans_presets.java:3710
+#: build/trans_presets.java:3866
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:73
 msgid "State"
@@ -31095 +31996 @@
 
 #. item "Places/State" label "Edit State"
-#: build/trans_presets.java:3711
+#: build/trans_presets.java:3867
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3717
+#: build/trans_presets.java:3873
 msgid "Region"
 msgstr "Regio"
 
 #. item "Places/Region" label "Edit Region"
-#: build/trans_presets.java:3718
+#: build/trans_presets.java:3874
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Places/County"
-#: build/trans_presets.java:3724
+#: build/trans_presets.java:3880
 msgid "County"
 msgstr ""
 
 #. item "Places/County" label "Edit County"
-#: build/trans_presets.java:3725
+#: build/trans_presets.java:3881
 msgid "Edit County"
 msgstr ""
@@ -31121 +32022 @@
 #. <separator/>
 #. item "Places/City"
-#: build/trans_presets.java:3732
+#: build/trans_presets.java:3888
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50
@@ -31128 +32029 @@
 
 #. item "Places/City" label "Edit City"
-#: build/trans_presets.java:3733
+#: build/trans_presets.java:3889
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Places/Town"
-#: build/trans_presets.java:3739
+#: build/trans_presets.java:3895
 msgid "Town"
 msgstr "Dorp"
@@ -31139 +32040 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
 #. item "Places/Town" label "Edit Town"
-#: build/trans_presets.java:3741
+#: build/trans_presets.java:3897
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Places/Suburb"
-#: build/trans_presets.java:3747
+#: build/trans_presets.java:3903
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -31150 +32051 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
 #. item "Places/Suburb" label "Edit Suburb"
-#: build/trans_presets.java:3749
+#: build/trans_presets.java:3905
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3755
+#: build/trans_presets.java:3911
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Places/Village" label "Edit Village"
-#: build/trans_presets.java:3756
+#: build/trans_presets.java:3912
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3762
+#: build/trans_presets.java:3918
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Places/Hamlet" label "Edit Hamlet"
-#: build/trans_presets.java:3763
+#: build/trans_presets.java:3919
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
 
+#. item "Places/Isolated Dwelling"
+#: build/trans_presets.java:3925
+msgid "Isolated Dwelling"
+msgstr ""
+
+#. item "Places/Isolated Dwelling" label "Edit Isolated Dwelling"
+#: build/trans_presets.java:3926
+#, fuzzy
+msgid "Edit Isolated Dwelling"
+msgstr "Wijzig Waterbron"
+
 #. <separator/>
 #. item "Places/Locality"
-#: build/trans_presets.java:3770
+#: build/trans_presets.java:3933
 msgid "Locality"
 msgstr ""
@@ -31182 +32094 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
 #. item "Places/Locality" label "Edit Locality"
-#: build/trans_presets.java:3772
+#: build/trans_presets.java:3935
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Peak"
-#: build/trans_presets.java:3780
+#: build/trans_presets.java:3943
 msgid "Peak"
 msgstr "Bergtop"
@@ -31193 +32105 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
 #. item "Geography/Peak" label "Edit Peak"
-#: build/trans_presets.java:3782
+#: build/trans_presets.java:3945
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Glacier"
-#: build/trans_presets.java:3788
+#: build/trans_presets.java:3951
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -31204 +32116 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
 #. item "Geography/Glacier" label "Edit Glacier"
-#: build/trans_presets.java:3790
+#: build/trans_presets.java:3953
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Volcano"
-#: build/trans_presets.java:3796
+#: build/trans_presets.java:3959
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -31215 +32127 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
 #. item "Geography/Volcano" label "Edit Volcano"
-#: build/trans_presets.java:3798
+#: build/trans_presets.java:3961
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Cave Entrance"
-#: build/trans_presets.java:3804
+#: build/trans_presets.java:3967
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -31226 +32138 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
 #. item "Geography/Cave Entrance" label "Edit Cave Entrance"
-#: build/trans_presets.java:3806
+#: build/trans_presets.java:3969
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
@@ -31232 +32144 @@
 #. <separator/>
 #. item "Geography/Island"
-#: build/trans_presets.java:3812
+#: build/trans_presets.java:3975
 msgid "Island"
 msgstr "Eiland"
@@ -31238 +32150 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
 #. item "Geography/Island" label "Edit Island"
-#: build/trans_presets.java:3814
+#: build/trans_presets.java:3977
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Islet"
-#: build/trans_presets.java:3820
+#: build/trans_presets.java:3983
 msgid "Islet"
 msgstr ""
@@ -31249 +32161 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
 #. item "Geography/Islet" label "Edit Islet"
-#: build/trans_presets.java:3822
+#: build/trans_presets.java:3985
 msgid "Edit Islet"
 msgstr ""
 
 #. group "Nature"
-#: build/trans_presets.java:3829
+#: build/trans_presets.java:3992
 msgid "Nature"
 msgstr ""
 
 #. item "Nature/Tree"
-#: build/trans_presets.java:3830
+#: build/trans_presets.java:3993
 msgid "Tree"
 msgstr "Boom"
@@ -31266 +32178 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
 #. item "Nature/Tree" label "Edit Tree"
-#: build/trans_presets.java:3833
+#: build/trans_presets.java:3996
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3838
+#: build/trans_presets.java:4001
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Nature/Wood"
-#: build/trans_presets.java:3840
+#: build/trans_presets.java:4003
 msgid "Wood"
 msgstr "Bos"
@@ -31283 +32195 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
 #. item "Nature/Wood" label "Edit Wood"
-#: build/trans_presets.java:3843
+#: build/trans_presets.java:4006
 msgid "Edit Wood"
 msgstr "Bos bewerken"
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:4009
 msgctxt "wood"
 msgid "coniferous"
@@ -31294 +32206 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:4009
 msgctxt "wood"
 msgid "deciduous"
@@ -31300 +32212 @@
 
 #. item "Nature/Wood" combo "Type" display value
-#: build/trans_presets.java:3846
+#: build/trans_presets.java:4009
 msgctxt "wood"
 msgid "mixed"
@@ -31306 +32218 @@
 
 #. item "Nature/Forest"
-#: build/trans_presets.java:3848
+#: build/trans_presets.java:4011
 msgid "Forest"
 msgstr "Bosbouw"
@@ -31313 +32225 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
 #. item "Nature/Forest" label "Edit Forest Landuse"
-#: build/trans_presets.java:3851
+#: build/trans_presets.java:4014
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:4018
 msgid "coniferous"
 msgstr "naaldbomen"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:4018
 msgid "deciduous"
 msgstr "loofbomen"
 
 #. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3855
+#: build/trans_presets.java:4018
 msgid "mixed"
 msgstr "gemengd"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3857
+#: build/trans_presets.java:4020
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Nature/Nature Reserve" label "Edit Nature Reserve"
-#: build/trans_presets.java:3858
+#: build/trans_presets.java:4021
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -31344 +32256 @@
 #. <separator/>
 #. item "Nature/Scree"
-#: build/trans_presets.java:3863
+#: build/trans_presets.java:4026
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Nature/Scree" label "Edit Scree"
-#: build/trans_presets.java:3864
+#: build/trans_presets.java:4027
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Nature/Fell"
-#: build/trans_presets.java:3868
+#: build/trans_presets.java:4031
 msgid "Fell"
 msgstr ""
@@ -31360 +32272 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
 #. item "Nature/Fell" label "Edit Fell"
-#: build/trans_presets.java:3870
+#: build/trans_presets.java:4033
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3874
+#: build/trans_presets.java:4037
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Nature/Scrub" label "Edit Scrub"
-#: build/trans_presets.java:3875
+#: build/trans_presets.java:4038
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Nature/Heath"
-#: build/trans_presets.java:3879
+#: build/trans_presets.java:4042
 msgid "Heath"
 msgstr "Heide"
@@ -31381 +32293 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
 #. item "Nature/Heath" label "Edit Heath"
-#: build/trans_presets.java:3881
+#: build/trans_presets.java:4044
 msgid "Edit Heath"
 msgstr "Heide bewerken"
 
 #. group "Land use"
-#: build/trans_presets.java:3886
+#: build/trans_presets.java:4049
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. item "Land use/Farmyard"
-#: build/trans_presets.java:3887
+#: build/trans_presets.java:4050
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -31398 +32310 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
-#: build/trans_presets.java:3890
+#: build/trans_presets.java:4053
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3895
+#: build/trans_presets.java:4058
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland" label "Edit Farmland Landuse"
-#: build/trans_presets.java:3896
+#: build/trans_presets.java:4059
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3901
+#: build/trans_presets.java:4064
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow" label "Edit Meadow Landuse"
-#: build/trans_presets.java:3902
+#: build/trans_presets.java:4065
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3907
+#: build/trans_presets.java:4070
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard" label "Edit Vineyard Landuse"
-#: build/trans_presets.java:3908
+#: build/trans_presets.java:4071
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Greenhouse Horticulture"
-#: build/trans_presets.java:3913
+#: build/trans_presets.java:4076
 msgid "Greenhouse Horticulture"
 msgstr ""
@@ -31439 +32351 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture" />
 #. item "Land use/Greenhouse Horticulture" label "Edit Greenhouse Horticulture"
-#: build/trans_presets.java:3915
+#: build/trans_presets.java:4078
 msgid "Edit Greenhouse Horticulture"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3921
+#: build/trans_presets.java:4084
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments" label "Edit Allotments Landuse"
-#: build/trans_presets.java:3922
+#: build/trans_presets.java:4085
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -31455 +32367 @@
 #. <separator/>
 #. item "Land use/Garden"
-#: build/trans_presets.java:3928
+#: build/trans_presets.java:4091
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden" label "Edit Garden"
-#: build/trans_presets.java:3929
+#: build/trans_presets.java:4092
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3933
+#: build/trans_presets.java:4096
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass" label "Edit Grass Landuse"
-#: build/trans_presets.java:3934
+#: build/trans_presets.java:4097
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Village Green"
-#: build/trans_presets.java:3939
+#: build/trans_presets.java:4102
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -31481 +32393 @@
 #. <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:3941
+#: build/trans_presets.java:4104
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Common"
-#: build/trans_presets.java:3946
+#: build/trans_presets.java:4109
 msgid "Common"
 msgstr "Algemeen"
@@ -31492 +32404 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
 #. item "Land use/Common" label "Edit Common"
-#: build/trans_presets.java:3948
+#: build/trans_presets.java:4111
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3952
+#: build/trans_presets.java:4115
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park" label "Edit Park"
-#: build/trans_presets.java:3953
+#: build/trans_presets.java:4116
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Recreation Ground"
-#: build/trans_presets.java:3957
+#: build/trans_presets.java:4120
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -31513 +32425 @@
 #. <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:3959
+#: build/trans_presets.java:4122
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -31519 +32431 @@
 #. <separator/>
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3965
+#: build/trans_presets.java:4128
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area" label "Edit Residential Landuse"
-#: build/trans_presets.java:3966
+#: build/trans_presets.java:4129
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Graveyard"
-#: build/trans_presets.java:3971
+#: build/trans_presets.java:4134
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -31535 +32447 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
 #. item "Land use/Graveyard" label "Edit Graveyard"
-#: build/trans_presets.java:3973
+#: build/trans_presets.java:4136
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
 #. item "Land use/Cemetery"
-#: build/trans_presets.java:3979
+#: build/trans_presets.java:4142
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -31546 +32458 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
 #. item "Land use/Cemetery" label "Edit Cemetery Landuse"
-#: build/trans_presets.java:3981
+#: build/trans_presets.java:4144
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3988
+#: build/trans_presets.java:4151
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail" label "Edit Retail Landuse"
-#: build/trans_presets.java:3989
+#: build/trans_presets.java:4152
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3994
+#: build/trans_presets.java:4157
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial" label "Edit Commercial Landuse"
-#: build/trans_presets.java:3995
+#: build/trans_presets.java:4158
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:4000
+#: build/trans_presets.java:4163
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial" label "Edit Industrial Landuse"
-#: build/trans_presets.java:4001
+#: build/trans_presets.java:4164
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Garages"
-#: build/trans_presets.java:4006
+#: build/trans_presets.java:4169
 msgid "Garages"
 msgstr ""
@@ -31587 +32499 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages" />
 #. item "Land use/Garages" label "Edit Garages"
-#: build/trans_presets.java:4008
+#: build/trans_presets.java:4171
 msgid "Edit Garages"
 msgstr ""
 
 #. item "Land use/Railway land"
-#: build/trans_presets.java:4014
+#: build/trans_presets.java:4177
 msgid "Railway land"
 msgstr ""
@@ -31598 +32510 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
 #. item "Land use/Railway land" label "Edit Railway Landuse"
-#: build/trans_presets.java:4016
+#: build/trans_presets.java:4179
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:4021
+#: build/trans_presets.java:4184
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military" label "Edit Military Landuse"
-#: build/trans_presets.java:4022
+#: build/trans_presets.java:4185
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -31614 +32526 @@
 #. <separator/>
 #. item "Land use/Construction area"
-#: build/trans_presets.java:4028
+#: build/trans_presets.java:4191
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area" label "Edit Construction Landuse"
-#: build/trans_presets.java:4029
+#: build/trans_presets.java:4192
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:4034
+#: build/trans_presets.java:4197
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
-#: build/trans_presets.java:4035
+#: build/trans_presets.java:4198
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:4040
+#: build/trans_presets.java:4203
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield" label "Edit Greenfield Landuse"
-#: build/trans_presets.java:4041
+#: build/trans_presets.java:4204
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:4046
+#: build/trans_presets.java:4209
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
-#: build/trans_presets.java:4047
+#: build/trans_presets.java:4210
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:4052
+#: build/trans_presets.java:4215
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry" label "Edit Quarry Landuse"
-#: build/trans_presets.java:4053
+#: build/trans_presets.java:4216
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
 #. group "Annotation"
-#: build/trans_presets.java:4060
+#: build/trans_presets.java:4223
 msgid "Annotation"
 msgstr ""
@@ -31670 +32582 @@
 #. item "Annotation/Addresses"
 #. Add address nodes
-#: build/trans_presets.java:4061
+#: build/trans_presets.java:4224
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:65
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
@@ -31679 +32591 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Addresses" label "Edit Address Information"
-#: build/trans_presets.java:4064
+#: build/trans_presets.java:4227
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -31685 +32597 @@
 #. <space />
 #. item "Annotation/Addresses" text "House number"
-#: build/trans_presets.java:4066
+#: build/trans_presets.java:4229
 msgid "House number"
 msgstr "Huisnummer"
@@ -31691 +32603 @@
 #. <optional>
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:4068
+#: build/trans_presets.java:4231
 msgid "House name"
 msgstr "Huisnaam"
@@ -31698 +32610 @@
 #. <key key="type" value="associatedStreet" />
 #. item "Relations/Associated street" text "Street name"
-#: build/trans_presets.java:4069 build/trans_presets.java:4186
+#: build/trans_presets.java:4232 build/trans_presets.java:4386
 msgid "Street name"
 msgstr "Straatnaam"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:4070
+#: build/trans_presets.java:4233
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:4071
+#: build/trans_presets.java:4234
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "Country code"
 msgstr "Landcode"
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "AT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "CH"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "DE"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "FR"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "GB"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "IT"
 msgstr ""
 
 #. item "Annotation/Addresses" combo "Country code" display value
-#: build/trans_presets.java:4072
+#: build/trans_presets.java:4235
 msgid "US"
 msgstr ""
@@ -31754 +32666 @@
 #. </optional>
 #. item "Annotation/Address Interpolation"
-#: build/trans_presets.java:4075
+#: build/trans_presets.java:4238
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
@@ -31764 +32676 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
-#: build/trans_presets.java:4078
+#: build/trans_presets.java:4241
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -31770 +32682 @@
 #. <space />
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "odd"
 msgstr "oneven"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "even"
 msgstr "even"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value
-#: build/trans_presets.java:4080
+#: build/trans_presets.java:4243
 msgid "alphabetic"
 msgstr ""
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:4082
+#: build/trans_presets.java:4245
 msgid "Contact"
 msgstr ""
 
 #. item "Annotation/Contact" label "Edit Contact information"
-#: build/trans_presets.java:4083
+#: build/trans_presets.java:4246
 msgid "Edit Contact information"
 msgstr ""
 
 #. item "Annotation/Contact" text "Image"
-#: build/trans_presets.java:4092
+#: build/trans_presets.java:4255
 msgid "Image"
 msgstr "Afbeelding"
@@ -31808 +32720 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
-#: build/trans_presets.java:4100
+#: build/trans_presets.java:4263
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -31818 +32730 @@
 #. <roles>
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:4106 build/trans_presets.java:4123
+#: build/trans_presets.java:4269 build/trans_presets.java:4286
 msgid "outer segment"
 msgstr "buitensegment"
@@ -31824 +32736 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:4107 build/trans_presets.java:4124
+#: build/trans_presets.java:4270 build/trans_presets.java:4287
 msgid "inner segment"
 msgstr "binnensegment"
@@ -31830 +32742 @@
 #. </roles>
 #. item "Relations/Boundary"
-#: build/trans_presets.java:4110
+#: build/trans_presets.java:4273
 msgid "Boundary"
 msgstr "Begrenzing"
@@ -31839 +32751 @@
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
 #. item "Relations/Boundary" label "Edit Boundary"
-#: build/trans_presets.java:4115
+#: build/trans_presets.java:4278
 msgid "Edit Boundary"
 msgstr "Wijzig begrenzing"
@@ -31845 +32757 @@
 #. <optional>
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "Boundary type"
 msgstr "Type begrenzing"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "administrative"
 msgstr "administratief"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "national"
 msgstr "nationaal"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "civil"
 msgstr "burgerlijk"
 
 #. item "Relations/Boundary" combo "Boundary type" display value
-#: build/trans_presets.java:4119
+#: build/trans_presets.java:4282
 msgid "political"
 msgstr "politiek"
 
 #. item "Relations/Boundary" combo "Administrative level"
-#: build/trans_presets.java:4120
+#: build/trans_presets.java:4283
 msgid "Administrative level"
 msgstr "Administratief niveau"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:4125
+#: build/trans_presets.java:4288
 msgid "Sub area"
 msgstr "Deeloppervlak"
 
 #. item "Relations/Boundary" role "Administration centre"
-#: build/trans_presets.java:4126
+#: build/trans_presets.java:4289
 msgid "Administration centre"
 msgstr "Administratief centrum"
@@ -31886 +32798 @@
 #. </roles>
 #. item "Relations/Turn restriction"
-#: build/trans_presets.java:4129
+#: build/trans_presets.java:4292
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -31893 +32805 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
-#: build/trans_presets.java:4132
+#: build/trans_presets.java:4295
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -31899 +32811 @@
 #. <key key="type" value="restriction" />
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "no_u_turn"
 msgstr "niet keren"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
 #. item "Relations/Turn restriction" combo "Restriction" display value
-#: build/trans_presets.java:4134
+#: build/trans_presets.java:4297
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -31941 +32853 @@
 #. <roles>
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:4139
+#: build/trans_presets.java:4302
 msgid "from way"
 msgstr "vanaf weg"
 
-#. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:4140
-msgid "via node or way"
+#. item "Relations/Turn restriction" role "via node or ways"
+#: build/trans_presets.java:4303
+#, fuzzy
+msgid "via node or ways"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "to way"
-#: build/trans_presets.java:4141
+#: build/trans_presets.java:4304
 msgid "to way"
 msgstr "naar weg"
@@ -31957 +32870 @@
 #. </roles>
 #. item "Relations/Route"
-#: build/trans_presets.java:4144
+#: build/trans_presets.java:4307
 msgid "Route"
 msgstr "Route"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
+#. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
+#. ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
+#. ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
 #. item "Relations/Route" label "Edit Route"
-#: build/trans_presets.java:4147
+#: build/trans_presets.java:4315
 msgid "Edit Route"
 msgstr "Wijzig route"
@@ -31970 +32888 @@
 #. <key key="type" value="route" />
 #. item "Relations/Route" combo "Route type"
-#: build/trans_presets.java:4149
+#. <key key="type" value="route" />
+#. item "Relations/Directional Route (North America)" combo "Route type"
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "Route type"
 msgstr "Type route"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -31982 +32903 @@
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "road"
 msgstr "straat"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "ferry"
 msgstr "veerboot"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "ski"
 msgstr "ski"
 
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
 #. </rule>
@@ -32042 +32967 @@
 #. <condition k="highway" v="steps"/>
 #. color foot
-#: build/trans_presets.java:4149 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:4317 build/trans_presets.java:4347
+#: 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
 msgid "foot"
 msgstr "voet"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "hiking"
 msgstr "trektocht"
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32063 +32990 @@
 
 #. item "Relations/Route" combo "Route type" display value
-#: build/trans_presets.java:4149
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
 msgid "detour"
 msgstr "omweg"
 
 #. item "Relations/Route" combo "Route type" display value
+#. item "Relations/Directional Route (North America)" combo "Route type" display value
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. </rule>
@@ -32074 +33003 @@
 #. <condition k="railway" v="subway"/>
 #. color subway
-#: build/trans_presets.java:4149 build/trans_style.java:978
+#: build/trans_presets.java:4317 build/trans_presets.java:4347
+#: build/trans_style.java:978
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77
@@ -32081 +33011 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: build/trans_presets.java:4152
+#. item "Relations/Directional Route (North America)" text "Symbol description"
+#: build/trans_presets.java:4320 build/trans_presets.java:4350
 msgid "Symbol description"
 msgstr "Beschrijving symbool"
@@ -32088 +33019 @@
 #. item "Relations/Route" text "Network"
 #. <optional>
+#. item "Relations/Directional Route (North America)" text "Network"
+#. <optional>
 #. item "Relations/Route network" text "Network"
-#: build/trans_presets.java:4155 build/trans_presets.java:4175
+#: build/trans_presets.java:4323 build/trans_presets.java:4353
+#: build/trans_presets.java:4375
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state"
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "Route state"
 msgstr "Staat route"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "proposed"
 msgstr "voorgesteld"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "alternate"
 msgstr "alternatief"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "temporary"
 msgstr "tijdelijk"
 
 #. item "Relations/Route" combo "Route state" display value
-#: build/trans_presets.java:4157
+#. item "Relations/Directional Route (North America)" combo "Route state" display value
+#: build/trans_presets.java:4325 build/trans_presets.java:4355
 msgid "connection"
 msgstr "verbinding"
 
 #. item "Relations/Route" text "Color (hex)"
-#: build/trans_presets.java:4158
+#. item "Relations/Directional Route (North America)" text "Color (hex)"
+#: build/trans_presets.java:4326 build/trans_presets.java:4356
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -32126 +33066 @@
 #. <roles>
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:4161
+#. </optional>
+#. <roles>
+#. item "Relations/Directional Route (North America)" role "route segment"
+#: build/trans_presets.java:4329 build/trans_presets.java:4359
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:4162
+#: build/trans_presets.java:4330
 msgid "forward segment"
 msgstr "voorwaarts segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:4163
+#: build/trans_presets.java:4331
 msgid "backward segment"
 msgstr "achterwaarts segment"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:4164
+#. item "Relations/Directional Route (North America)" role "halt point"
+#: build/trans_presets.java:4332 build/trans_presets.java:4364
 msgid "halt point"
 msgstr "haltepunt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:4165
+#. item "Relations/Directional Route (North America)" role "forward halt point"
+#: build/trans_presets.java:4333 build/trans_presets.java:4365
 msgid "forward halt point"
 msgstr "voorwaarts haltepunt"
 
 #. item "Relations/Route" role "backward halt point"
-#: build/trans_presets.java:4166
+#. item "Relations/Directional Route (North America)" role "backward halt point"
+#: build/trans_presets.java:4334 build/trans_presets.java:4366
 msgid "backward halt point"
 msgstr "achterwaarts haltepunt"
 
 #. </roles>
+#. item "Relations/Directional Route (North America)"
+#: build/trans_presets.java:4337
+msgid "Directional Route (North America)"
+msgstr ""
+
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
+#. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
+#. ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
+#. 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:4345
+msgid "Edit Directional Route (used in North America)"
+msgstr ""
+
+#. item "Relations/Directional Route (North America)" role "east segment"
+#: build/trans_presets.java:4360
+#, fuzzy
+msgid "east segment"
+msgstr "buitensegment"
+
+#. item "Relations/Directional Route (North America)" role "north segment"
+#: build/trans_presets.java:4361
+#, fuzzy
+msgid "north segment"
+msgstr "buitensegment"
+
+#. item "Relations/Directional Route (North America)" role "west segment"
+#: build/trans_presets.java:4362
+#, fuzzy
+msgid "west segment"
+msgstr "buitensegment"
+
+#. item "Relations/Directional Route (North America)" role "south segment"
+#: build/trans_presets.java:4363
+#, fuzzy
+msgid "south segment"
+msgstr "buitensegment"
+
+#. </roles>
 #. item "Relations/Route network"
-#: build/trans_presets.java:4169
+#: build/trans_presets.java:4369
 msgid "Route network"
 msgstr "Routenetwerk"
@@ -32163 +33151 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
 #. item "Relations/Route network" label "Edit route network"
-#: build/trans_presets.java:4171
+#: build/trans_presets.java:4371
 msgid "Edit route network"
 msgstr "Wijzig routenetwerk"
@@ -32170 +33158 @@
 #. <roles>
 #. item "Relations/Route network" role "member"
-#: build/trans_presets.java:4179
+#: build/trans_presets.java:4379
 msgid "member"
 msgstr "lid"
@@ -32176 +33164 @@
 #. </roles>
 #. item "Relations/Associated street"
-#: build/trans_presets.java:4182
+#: build/trans_presets.java:4382
 msgid "Associated street"
 msgstr "Samenhangende straat"
@@ -32182 +33170 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
 #. item "Relations/Associated street" label "Edit associated street"
-#: build/trans_presets.java:4184
+#: build/trans_presets.java:4384
 msgid "Edit associated street"
 msgstr "Wijzig samenhangende straat"
 
 #. item "Relations/Associated street" role "house"
-#: build/trans_presets.java:4189
+#: build/trans_presets.java:4389
 msgid "house"
 msgstr "huis"
@@ -36368 +37356 @@
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:505
-#, fuzzy
 msgid "Line information"
-msgstr "Informatie"
-
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:588
+msgstr ""
+
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:589
 msgid "Cannot place node outside of the world."
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:618
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:619
 msgid "Draw the way by mouse"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:649
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:650
 #, java-format
 msgid "min distance={0} px ({1} m)"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:691
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:692
 msgid "Convert way to FastDraw line"
 msgstr ""
 
-#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:701
+#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:702
 #, java-format
 msgid "Eps={0}, {1} points, {2} p/km"
@@ -38148 +39135 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:220
 msgid "Name:"
 msgstr ""
@@ -39491 +40478 @@
 msgstr "Verbonden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:160
 msgid "no name"
 msgstr ""
@@ -39613 +40600 @@
 msgstr "Metingen"
 
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:55
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:58
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:21
+#, fuzzy
+msgid "Merge overlap"
+msgstr "Laag samenvoegen"
+
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:56
+#, fuzzy
+msgid "Merge overlap of ways."
+msgstr "Overlappende wegen."
+
+#. Commit
+#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:264
+msgid "Merge Overlap (combine)"
+msgstr ""
+
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52
@@ -39645 +40649 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:41
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:22
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:21
 msgid "Convert to multipolygon"
 msgstr ""
@@ -39653 +40657 @@
 msgstr ""
 
-#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:81
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:80
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
@@ -40626 +41630 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:217
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:293
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1834
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1903
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1845
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1914
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:306
 msgid ""
@@ -40638 +41642 @@
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:257
 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:295
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1836
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1905
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1847
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1916
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:266
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:308
@@ -40702 +41706 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:255
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1027
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1038
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:294
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:476
@@ -40709 +41713 @@
 
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:266
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1038
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1049
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:305
 msgid "Suggest Stops"
@@ -40716 +41720 @@
 #. JButton
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:321
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:750
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:873
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:761
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:884
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:360
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:497
@@ -40725 +41729 @@
 #. JButton
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:347
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:776
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:899
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:787
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:910
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:386
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:523
@@ -40792 +41796 @@
 
 #: ../plugins/public_transport/src/public_transport/ItineraryTableModel.java:65
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:295
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:301
 #, java-format
 msgid "[ID] {0}"
@@ -40801 +41805 @@
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:149
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:155
 #, java-format
 msgid " [ID] {0}"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:417
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:423
 msgid "Route patterns ..."
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:418
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
 msgid "Edit Route patterns for public transport"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:429
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:435
 msgid "Route Patterns"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:432
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:438
 msgid "Overview"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:436
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:442
 msgid "Itinerary"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:438
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:444
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
 msgid "Stops"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:440
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:446
 msgid "Meta"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:454
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:460
 msgid "Existing route patterns:"
 msgstr ""
 
 #. JButton
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:538
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:830
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:953
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:544
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:841
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:964
 msgid "Reflect"
 msgstr ""
 
 #. JLabel
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:558
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:564
 msgid "Required tags:"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:625
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:631
 msgid "Common tags:"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:679
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:690
 msgid "Additional tags:"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:708
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:719
 msgid "Add a new Tag"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:729
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:851
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:740
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:862
 msgid "Name/Id"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:852
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:863
 msgid "Ref"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:972
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:983
 msgid "Stops are possible on the"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:983
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:994
 msgid "right hand side"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:994
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1005
 msgid "left hand side"
 msgstr ""
 
-#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1005
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:1016
 msgid "Maximum distance from route"
 msgstr ""
@@ -43490 +44494 @@
 msgstr ""
 
-#~ msgid "Change values?"
-#~ msgstr "Waarden aanpassen?"
-
-#~ msgid "unusual tag combination"
-#~ msgstr "ongebruikelijke tagcombinatie"
-
 #~ msgid ""
-#~ "Replace the original white background by the backgound color defined in "
-#~ "JOSM preferences."
+#~ "<b>tags:</b>... - object with given number of tags (tags:count or tags:"
+#~ "min-max)"
 #~ msgstr ""
-#~ "De oorspronkelijke witte achtergrond vervangen door de achtergrondkleur "
-#~ "die in de JOSM-voorkeuren is opgegeven."
-
-#~ msgid "Upload cancelled"
-#~ msgstr "Uploaden afgebroken"
-
-#~ msgid "Keep their coordiates"
-#~ msgstr "Hun coördinaten houden"
-
-#~ msgid "Keep my coordiates"
-#~ msgstr "Mijn coördinaten houden"
-
-#~ msgid ""
-#~ "Ignoring exception because download has been cancelled. Exception was: {0}"
+#~ "<b>tags:</b>... - objekt met bepaald aantal tags (tags:aantal of tags:min-"
+#~ "max)"
+
+#~ msgid "The \"from\" way does not start or end at a \"via\" way."
 #~ msgstr ""
-#~ "Negeren uitzondering omdat ophalen afgebroken is. Uitzondering was: {0}"
-
-#~ msgid "Always update withouth asking"
-#~ msgstr "Altijd bijwerken zonder te vragen"
-
-#~ msgid ""
-#~ "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+#~ "Het lid met als rol \"from\" start of eindigt niet bij een lid met als "
+#~ "rol \"via\""
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" way."
 #~ msgstr ""
-#~ "Waarschuwing; onverwacht JOSM-versienummer in revisiebestand, waarde is "
-#~ "''{0}''"
-
-#~ msgid ""
-#~ "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-#~ "Please report this  at http://josm.openstreetmap.de . This is not a "
-#~ "critical error, it should be safe to continue in your work."
-#~ msgstr ""
-#~ "JOSM verwachtte om primitief [{0} {1}] in de dataset te vinden, maar deze "
-#~ "is net aanwezig. Gelieve dit te melden op http://josm.openstreetmap.de . "
-#~ "Dit is geen kritieke fout, het zou veilig moeten zijn om verder te werken "
-#~ "zonder JOSM opnieuw te starten."
-
-#~ msgid ""
-#~ "Warning: Failed to initialize preferences.Failed to reset preference file "
-#~ "to default: {0}"
-#~ msgstr ""
-#~ "Waarschuwing: Het was niet mogelijk om de voorkeursinstellingen te "
-#~ "initialiseren. Het voorkeursinstellingenbestand kon niet worden "
-#~ "teruggezet naar de standaardinstellingen: {0}"
-
-#~ msgid ""
-#~ "Warning: failed to open input stream for resource ''/data/{0}''. Cannot "
-#~ "load NTF<->RGF93 grid"
-#~ msgstr ""
-#~ "Waarschuwing: invoerstream voor resource ''/data/{0}'' kon niet worden "
-#~ "geopend . NTF<->RGF93 grid kan niet worden geladen"
-
-#~ msgid ""
-#~ "<html>Alternatively you may enter a <strong>tile address</strong> for a "
-#~ "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. "
-#~ "Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
-#~ "too.</html>"
-#~ msgstr ""
-#~ "<html>Of u kan een <strong>tegeladres</strong> ingeven voor een enkele "
-#~ "tegel het volgende formaat: <i>zoomniveau/x/y</i>, bv. <i>15/256/223</i>. "
-#~ "Tegeladressen in het formaat<i>zoom,x,y</i> or <i>zoom;x;y</i> zijn ook "
-#~ "toegelaten.</html>"
-
-#~ msgid ""
-#~ "List of merged elements. They will replace the my elements when the merge "
-#~ "decisions are applied."
-#~ msgstr ""
-#~ "Lijst van samengevoegde elementen. Deze zullen de mijn elementen "
-#~ "vervangen wanneer de beslissing tot samenvoegen wordt toegepast."
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task is cancelled. Exception: {0}"
-#~ msgstr ""
-#~ "Waarschuwing: uitzondering werd genegeerd omdat de taak werd geannuleerd. "
-#~ "Uitzondering: {0}"
-
-#~ msgid ""
-#~ "Warning: Ignoring exception because task is cancelled. Exception: {0}"
-#~ msgstr ""
-#~ "Waarschuwing: Uitzondering wordt genegeerd omdat de taak werd "
-#~ "geanulleerd. Uitzondering: {0}"
-
-#~ msgid ""
-#~ "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-#~ msgstr ""
-#~ "Waarschuwing: uitzondering wordt genegeerd omdat de taak werd afgebroken. "
-#~ "Uitzondering was: {0}"
-
-#~ msgid "Supicious data found. Upload anyway?"
-#~ msgstr "Verdachte data gevonden. Toch versturen?"
-
-#~ msgid "Changeset"
-#~ msgstr "Wijzigingenset"
+#~ "Het lid met als rol \"to\" start of eindigt niet bij een lid met als rol "
+#~ "\"via\""
+
+#~ msgid "Reversed water: land not on left side"
+#~ msgstr "Omgekeerd water: land niet aan linker zijde"
+
+#~ msgid "Incline Steep"
+#~ msgstr "Steile Helling"
+
+#~ msgid "fossil"
+#~ msgstr "fossiele brandstoffen"