Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 19557)
+++ applications/editors/josm/i18n/po/nl.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 11:19-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:59+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -95,4 +95,5 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -220,5 +221,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Klik om door te gaan en om {0} browsers te openen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
@@ -243,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -255,13 +256,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -270,5 +271,8 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -278,5 +282,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Klik hier om het openen van de externe browsers te annuleren"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -295,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Samenvoegen"
@@ -324,5 +328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -389,9 +393,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -399,5 +403,7 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -448,6 +454,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -465,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -472,11 +478,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -513,5 +519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflict"
@@ -523,9 +529,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "vorige"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "volgende"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -646,14 +652,14 @@
 msgstr "Selecteer twee of meer wegen om te combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Geselecteerde objecten naar klembord kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Selecteer iets om te kopiëren"
@@ -686,8 +692,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -696,5 +702,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -751,16 +757,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Er waren {0} tegenstrijdigheden tijdens het importeren."
-msgstr[1] "Er waren {0} tegenstrijdigheden tijdens het importeren."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflikten gedurende ophalen"
-msgstr[1] "Conflikten gedurende ophalen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -781,4 +786,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -788,4 +795,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Dupliceer selectie door kopiëren en direct plakken."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Weg dupliceren"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "De geselecteerde leden omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Laag: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Inzoomen op {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -863,5 +898,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
-msgstr ""
+msgstr "Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
@@ -876,10 +911,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "De geselecteerde weg bevat niet de geselecteerde knoop."
-msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -1002,5 +1036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1153,21 +1187,22 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr ""
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
+msgstr "<html>Kan directory niet openen.<br>Selecteer alstublieft een bestand!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
 msgid "Open file"
-msgstr ""
+msgstr "Bestand openen"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Bezig met 1 bestand te openen..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Bestanden aan het openen"
-msgstr[1] "Bestanden aan het openen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1223,7 +1258,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"When one or more ways are selected, the shape is adjusted such, that all "
-"angles are 90 or 180 degrees.<h3>You can add two nodes to the selection. "
-"Then, the direction is fixed by these two reference nodes.(Afterwards, you "
+"<h3>When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
 "can undo the movement for certain nodes:<br>Select them and press the "
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
@@ -1237,5 +1272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn."
 
@@ -1269,4 +1305,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1282,5 +1322,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
+msgstr "Geselecteerde elementen kunnen niet recht worden gelegd."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1297,9 +1348,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Verwijder oncomplete delen?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Plakken zonder oncomplete delen"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1386,18 +1437,18 @@
 #: ../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:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1422,12 +1473,13 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Fout"
@@ -1562,5 +1614,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1772,9 +1824,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplicaatknopen {0} in {1} knopen"
-msgstr[1] "Duplicaatknopen {0} in {1} knopen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1818,5 +1870,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Ophalen data"
@@ -1825,5 +1877,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Update veranderd"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -1831,4 +1883,5 @@
 "Updates the currently modified objects from the server (re-downloads data)"
 msgstr ""
+"Update de huidig veranderde objecten van de server (download de data opnieuw)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
@@ -2249,6 +2302,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2286,4 +2339,7 @@
 "Really move them?"
 msgstr ""
+"U heeft meer dan {0} elementen verplaatst. Het verplaatsen van een groot "
+"aantal elementen is meestal een fout.\n"
+"Wilt u ze echt verplaatsen?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
@@ -2328,7 +2384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "noord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2370,5 +2425,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
@@ -2417,8 +2472,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-#, fuzzy
 msgid "<b>\"Baker Street\"</b> - ''Baker 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:120
@@ -2561,5 +2614,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Zoeken"
@@ -2599,25 +2652,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2631,5 +2681,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2637,5 +2687,5 @@
 "van gebruik: sleutel=waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2658,7 +2708,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Onverwacht token: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2780,9 +2830,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "{0} objecten toegevoegd"
-msgstr[1] "{0} objecten toegevoegd"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2832,12 +2882,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Verwijder \"{0}\" voor {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Stel in {0}={1} voor {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2901,17 +2951,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Verwijdermodus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Verwijder {0} weg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Verwijder {0} relatie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2957,5 +3007,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Bevestig verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
@@ -2992,9 +3042,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "\"{0}\" objecten verwijderd"
-msgstr[1] "\"{0}\" objecten verwijderd"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3039,32 +3089,32 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
+msgstr "Los {0} tag conflicten op in relatie {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "aan {0} primitief"
-msgstr[1] "aan {0} primitieven"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Conflicten oplossen in coördinaten in {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Conflicten oplossen in coördinaten in {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Los conflikten op in leden lijst van relatie {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Los conflicten op in knooppunten lijst van weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
@@ -3194,4 +3244,6 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Waarschuwing: Voorkeuren bestand \"{0}\" ontbreekt. Standaard voorkeuren "
+"bestand wordt aangemaakt."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3201,4 +3253,6 @@
 "file."
 msgstr ""
+"Waarschuwing: Vervangen van bestaand voorkeuren bestand \"{0}\" door "
+"standaard voorkeuren bestand."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3307,5 +3361,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3313,5 +3367,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3319,5 +3373,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3325,5 +3379,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3348,5 +3402,5 @@
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor weg met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162
@@ -3354,20 +3408,20 @@
 #, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor knooppunt met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
 #, java-format
 msgid "Missing merge target for object with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor object met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241
 #, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor relatie met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Samenvoeg doel van type {0} met id {1} ontbreekt"
 
 #. should not happen
@@ -3386,5 +3440,5 @@
 msgctxt "filter"
 msgid "E"
-msgstr ""
+msgstr "I"
 
 #. column header: hide filter
@@ -3402,15 +3456,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3423,8 +3475,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3446,19 +3497,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3467,5 +3518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3473,5 +3524,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3594,6 +3645,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3603,5 +3654,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3612,7 +3663,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3634,5 +3685,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "achtergrond"
@@ -3776,6 +3827,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3783,37 +3834,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "snelweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "spoorweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "waterweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "grondgebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3822,10 +3874,10 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3834,5 +3886,5 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3869,6 +3921,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflict"
@@ -3879,7 +3931,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Verbinding is mislukt."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4084,5 +4135,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialiseren"
@@ -4125,5 +4175,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4134,5 +4184,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Bewerken"
@@ -4203,29 +4253,29 @@
 msgstr "schalen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "De geografische lengtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "De naam van het object bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "De geografische breedtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "De hoek tussen het vorige en het huidige wegsegment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "De (kompas)richting van het lijnsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "De lengte van het nieuwe wegsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4233,9 +4283,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4398,16 +4448,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags ({0} conflicten)"
-msgstr[1] "Tags ({0} conflicten)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} tag-conflicten om op te lossen"
-msgstr[1] "{0} tag-conflicten om op te lossen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4462,16 +4512,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4667,8 +4717,12 @@
 msgstr "Knoop"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Knopen in de oudste samenvoegen"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4816,5 +4870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4860,5 +4914,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4988,10 +5047,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "geen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "alles"
@@ -5021,7 +5080,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "De geselecteerde weg bevat niet de geselecteerde knoop."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5071,7 +5130,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5081,6 +5140,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5260,10 +5319,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5283,13 +5342,13 @@
 msgstr "Opdrachtenlijst: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Oplossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5297,6 +5356,6 @@
 "lijst openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5330,8 +5389,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<br>Conflict resolutions will not be applied unless all differences<br>are "
+"resolved.<br>Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences will not be applied.</"
+"strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</"
+"html>"
 msgstr ""
 
@@ -5354,5 +5414,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5361,5 +5421,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5439,43 +5499,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Lagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Tonen/Verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
 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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Weg dupliceren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
@@ -5489,6 +5554,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relaties"
@@ -5498,69 +5563,69 @@
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 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:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Huidige selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Een selectielijstscherm openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Naar de geselecteerde element(en) zoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Op selectie inzoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, 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:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5568,5 +5633,5 @@
 msgstr "Selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5919,8 +5984,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. -->
 #. <space />
 #. <key key="highway" value="construction" />
@@ -5992,4 +6055,7 @@
 #. <space />
 #. <key key="waterway" value="drain" />
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#. <space />
+#. <key key="waterway" value="ditch" />
 #. item "Water/Water/Stream" label "Edit Stream"
 #. <space />
@@ -6068,6 +6134,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6109,6 +6176,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
 #. <key key="aeroway" value="aerodrome" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#. <key key="aeroway" value="terminal" />
 #. item "Travel/Accomodation/Hotel" label "Edit Hotel"
 #. <key key="tourism" value="hotel" />
@@ -6577,152 +6646,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: 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:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 build/trans_presets.java:1960
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: build/trans_presets.java:2068 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Naam"
@@ -7105,5 +7176,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<verschillend>"
@@ -7158,55 +7229,55 @@
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, 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:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 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:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 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:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 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:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7533,7 +7604,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Wil je dit toestaan?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7628,9 +7698,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Negeren uitzondering omdat ophalen afgebroken is. Uitzondering was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7650,47 +7719,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
 msgid "Please enter a name for the bookmarked download area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7815,18 +7883,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7837,34 +7905,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Voer een plaats in om naar te zoeken:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr ""
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7875,7 +7943,9 @@
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
 #. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
 #. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Surveillance" text "Name"
 #. item "Man Made/Power Generator" label "Edit Power Generator"
 #. <key key="power" value="generator" />
@@ -7884,10 +7954,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Soort"
@@ -7896,5 +7967,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7906,17 +7977,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "onbekend"
@@ -8269,5 +8339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Conflicten gedetecteerd"
@@ -8721,9 +8791,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
 #. item "Highways/Streets/Residential" check "Embankment"
 #. item "Highways/Streets/Living Street" check "Embankment"
 #. item "Highways/Streets/Pedestrian" check "Embankment"
-#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8733,7 +8803,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
+#. item "Water/Water/Ditch" text "Name"
 #. item "Water/Water/Stream" text "Name"
 #. item "Water/Water/Canal" text "Name"
@@ -8745,16 +8815,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "laag"
@@ -9170,68 +9240,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Kleur aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9241,23 +9311,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9267,5 +9337,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9273,5 +9343,5 @@
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9279,5 +9349,5 @@
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9287,23 +9357,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Lengte: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9312,5 +9382,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9319,10 +9389,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9332,43 +9402,43 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9379,9 +9449,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9391,5 +9461,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9399,23 +9469,23 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gegevenslaag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9424,5 +9494,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9436,5 +9506,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9447,11 +9517,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9460,32 +9530,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API-versie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9532,28 +9602,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Bestand {0} is geladen met de naam \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fout tijdens ontleden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kan \"{0}\" niet lezen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9565,34 +9634,34 @@
 "een tijdzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Fototijd (uit exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-tijd (lees uit de bovenstaande foto): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Ik bevind mij in tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Geen datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Open een andere foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9602,64 +9671,64 @@
 "Gebruik de verwachte indeling a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Ongeldige datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Nog geen GPX-track geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Een ander GPX-spoor openene"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 msgid "Auto-Guess"
 msgstr "Automatisch schatten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Verschuiving:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9669,45 +9738,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Correleer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Ongeldige verschuiving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tijdzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9716,5 +9785,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9722,21 +9791,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Koppelen van foto's aan track is mislukt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr "De selecteerde foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9745,17 +9814,17 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX-track heeft geen tijdinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "U mag een GPX-track selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Geen GPX-tracks geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9766,5 +9835,5 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9775,75 +9844,75 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-locaties uit EXIF halen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Mappenscan starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Foto's lezen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lezen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Map {0} scannen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leeg bestand in {0} gevonden\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Geen gegevens geladen."
-msgstr[1] "Geen gegevens geladen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} zijn getagd als GPS"
-msgstr[1] "{0} zijn getagd als GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9852,5 +9921,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9947,5 +10016,5 @@
 msgstr "GPS-marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9953,5 +10022,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9960,29 +10029,29 @@
 msgstr[1] "{0} bestaat uit {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Geluid synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pauzeer het geluid op het moment dat je de synchronisatiehulp hoort."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Geluid gesynchroniseerd op punt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan in de afgespeelde laag niet synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Geluidsmarker op afspeelstart zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9992,17 +10061,17 @@
 "marker wilt hebben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Tekst/pictogrammen tonen/verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -10012,5 +10081,5 @@
 "geluidsopname afspeelde (na de eerste marker)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -10020,5 +10089,5 @@
 "of op het trackpunt waar je wilt synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Kan nieuwe geluidsmarker niet aanmaken."
@@ -10044,5 +10113,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -10050,5 +10119,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10100,8 +10169,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10191,8 +10258,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10251,7 +10316,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Verbinding is mislukt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10331,8 +10395,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Selecteer minstens vier knopen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10342,8 +10404,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Sluit dialoog en stop het downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10656,5 +10716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Selecteer een rij om te bewerken."
@@ -10668,5 +10728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10820,9 +10880,4 @@
 msgstr "Tekenstijl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Laag: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10852,6 +10907,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Alles"
@@ -10890,8 +10945,8 @@
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Auto"
@@ -10913,13 +10968,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Fiets"
@@ -10952,12 +11007,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Te voet"
@@ -11009,11 +11064,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
-"Maximum lengte (in meters) om lijnen tekenen. Kies ''-1'' om alle lijnen "
-"tekenen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11315,5 +11367,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11329,15 +11380,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Het kan je opgevallen zijn dat de toetsenselectielijst op de volgende "
-"pagina alle toetsen weergeeft op alle soorten toetsenborden die bekend zijn "
-"bij Java, en niet alleen de toetsen van jouw toetsenbord. Gebruik alleen die "
-"waarden die overeenkomen met een bestaande toets van je toetsenbord. Dus als "
-"je toetsenbord geen Copy-toets heeft (PC-toetsenborden hebben hem niet, Sun-"
-"toetsenborden wel), gebruik deze toets dan ook niet. Ook zullen er 'toetsen' "
-"in de lijst staan die overeenkomen met een sneltoets op je toetsenbord (b.v. "
-"':'). Gebruik deze ook niet, maar in plaats daarvan de basistoets (';' op US-"
-"toetsenborden, '.' op Duitse toetsenborden, enz.). Als je deze regels "
-"overtreedt kunnen er conflicten ontstaan omdat JOSM niet kan weten dat CTRL"
-"+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk hetzelfde is...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11958,5 +11998,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11964,18 +12011,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "afgesloten weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11986,16 +12033,16 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12004,18 +12051,17 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Eigenschappen veranderen"
@@ -12291,6 +12337,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12315,9 +12361,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12333,7 +12379,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Zoeken naar de oever..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12341,7 +12386,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12413,5 +12464,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Geïmporteerde coördinaten: "
@@ -12512,9 +12563,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Versturen van {0} objecten ..."
-msgstr[1] "Versturen van {0} objecten ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13041,9 +13092,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Versturen van {0} objecten ..."
-msgstr[1] "Versturen van {0} objecten ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13141,5 +13192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13147,6 +13198,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
-msgstr[1] "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13414,5 +13465,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13420,8 +13470,4 @@
 "file a bug report."
 msgstr ""
-"Een onverwachte uitzondering is opgetreden.\n"
-"\n"
-"Dit is altijd een programmeerfout. Als je de nieuwste versie\n"
-"van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13513,6 +13559,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
 "<br>Please launch the preferences dialog and retrieve another OAuth token.</"
 "html>"
@@ -13628,6 +13674,6 @@
 msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13636,5 +13682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13782,4 +13828,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13870,5 +13917,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -14460,5 +14507,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Locatie"
@@ -14621,21 +14668,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14667,9 +14714,9 @@
 msgstr "Weg dupliceren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14684,13 +14731,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Pad van GPX-laag importeren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Bestaand pad laten vallen"
@@ -14699,6 +14746,6 @@
 #. TODO: register a listener and show menu entry only if gps layers are available
 #. no gps layer
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Geen GPX-gegevenslaag gevonden."
@@ -14927,17 +14974,17 @@
 msgstr "Verzameling afbeeldingen laden als een nieuwe laag."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Richtingsindex '{0}' niet gevonden"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "De beginlocatie bevindt zich buiten de bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Zoeken naar de oever..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14981,42 +15028,41 @@
 msgstr "Dubbele knopen verwijderen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker-trace"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "oost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "noordoost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "noord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "noordwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "west"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "zuidwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "zuid"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "zuidoost"
@@ -15072,6 +15118,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15080,74 +15126,74 @@
 msgstr "water"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "kustlijn"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maximum aantal segmenten per weg"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximum aantal knopen in oorspronkelijke spoor"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximale grijswaarde die als water geldt (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Nauwkeurigheid lijnvereenvoudiging (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolutie van Landsat-tegels (pixels per graad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Grootte van Landsat-tegels (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Alle sporen oostwaarts verschuiven (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Alle sporen noordwaarts verschuiven (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Richting om naar land te zoeken"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Wegen taggen als"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-laag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maximale buffergrootte (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maximale bufferleeftijd (dagen)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Brontekst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15157,5 +15203,5 @@
 "50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
 msgid ""
 "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -15165,5 +15211,5 @@
 "IR-1-gegevens). Tussen 0-255, standaard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15174,5 +15220,5 @@
 "Standaard 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15180,55 +15226,55 @@
 "Resolutie van Landsat-tegels, gemeten in pixels per graad. Standaard 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Grootte van een landsat-tegel, gemeten in pixels. Standaard 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Alle punten oostwaarts verschuiven (graden). Standaard 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Alle punten noordwaarts verschuiven (graden). Standaard 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Richting om land te zoeken. Standaard oost."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Wegen als water, kustlijn, land of niets taggen. Standaard is water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Welke WMS-laag als achtergrond gebruiken voor tracing? Standaard is IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximum grootte van een buffermap in bytes. Standaard is 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximum leeftijd voor een gebufferd bestand in dagen. Standaard is 100."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Gegevensbron tekst. Standaard is Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Een plugin om waterlichamen op Landsat-beeldmateriaal te tracen."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Voorkeuren Lakewalker-plugin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Afbeeldingstegel downloaden..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kan afbeelding niet ophalen"
@@ -15252,5 +15298,5 @@
 msgstr "Verbinding is mislukt"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15281,5 +15327,5 @@
 msgstr "Baan"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-laag"
@@ -15353,5 +15399,5 @@
 msgstr "Hoek tussen twee geselecteerde knopen"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Laag om in te meten"
@@ -15617,4 +15663,76 @@
 msgid "Firefox executable"
 msgstr "Firefox-executable"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Reservoir"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Coördinaten van de nieuwe knoop invoeren."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Backupbestanden behouden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Fout"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Ingevoerde tijd kon niet worden ontleed."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Kon bestand ''{0}'' niet hernoemen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Backupbestanden behouden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Backupbestanden behouden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Overschrijven?"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Kan elementsoort niet vinden"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15891,6 +16009,6 @@
 msgstr "Verkregen gegevens iedere minuut naar bestand schrijven."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:65
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:81
 #, java-format
 msgid "Error while exporting {0}: {1}"
@@ -16012,72 +16130,130 @@
 msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Rijtjeshuis maken"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Adresinterpolatie"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Straten"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Tegelnummers"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Puntnummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "De huisnummers op een terras omkeren"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Een nieuwe relatie aanmaken"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Weg dupliceren"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Straatnaam"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Het terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "De huisnummers op een terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Een terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Rijtjeshuis maken"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Maak losse gebouwen uit een langgerekt gebouw."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Terras"
@@ -16313,5 +16489,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
@@ -16322,5 +16498,5 @@
 "Deze test controleert of er geen knopen met precies dezelfde locatie zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16332,9 +16508,9 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16369,5 +16545,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -16521,7 +16697,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Ongeldige tag/waarde-combinaties"
@@ -16529,81 +16705,81 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Tekenprobleem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Toets ''{0}'' is ongeldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tags met lege waarden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Ongeldige eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Ongeldige spatie in eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Eigenschapwaarde begin of eindigt met een spatie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Eigenschapwaarden bevatten HTML-codes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Voorkeuzen bevatten geen eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Voorkeuzen bevatten geen eigenschapswaarde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "Herstel-mij's"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Eigenschapsleutels controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Valideer eigenschapsleutels met een woordenlijst"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Uitgebreide eigenschapchecker gebruiken"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Tagcheckerbron"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16614,86 +16790,86 @@
 "tagchecker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Nieuwe bron aan lijst toevoegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "De geselecteerde bron bewerken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "De geselecteerde bron uit de lijst verwijderen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Gegevensbronnen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Eigenschapwaarden controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Valideer eigenschapwaarden tegen presets"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Controleer op herstel-mij's."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Controleer op tekenknopen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Controleer of kaarttekenen fouten heeft gevonden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Standaardgegevensbestand gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Standaardbestand spellingscontrole gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Eigenschappen herstellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Kan elementsoort niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Kan waarschuwingsniveau niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ongeldige expressie ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17140,5 +17316,5 @@
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17149,64 +17325,64 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17462,6 +17638,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17470,15 +17653,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17487,10 +17670,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17499,15 +17682,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17517,10 +17700,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17529,5 +17712,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17536,10 +17719,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17646,6 +17829,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. item "Airport/Runway" label "Edit Runway"
+#. <key key="aeroway" value="runway" />
 #. <optional>
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#. <key key="aeroway" value="taxiway" />
+#. <optional>
+#. item "Airport/Helipad" label "Edit Helipad"
+#. <key key="aeroway" value="helipad" />
+#. <optional>
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#. <key key="aeroway" value="gate" />
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
@@ -17653,6 +17845,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referentie"
@@ -17669,5 +17862,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Lanen"
@@ -17689,10 +17882,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -17736,14 +17929,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -17786,13 +17979,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17830,13 +18023,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -17871,13 +18064,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Verdieping"
@@ -17912,13 +18105,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Verhoging"
@@ -18050,4 +18243,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Een enkelbaansweg bewerken"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18065,15 +18267,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -18085,5 +18287,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Woongebied"
@@ -18092,5 +18294,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Een straat bewerken"
@@ -18108,16 +18310,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -18139,166 +18344,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "verhard"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "onverhard"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "oerbos"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "gras"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "zand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "gebied"
@@ -18306,5 +18518,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Woonerf"
@@ -18313,5 +18525,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Een woonerf bewerken"
@@ -18319,5 +18531,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Voetgangers"
@@ -18326,5 +18538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Voetgangerszone bewerken"
@@ -18332,5 +18544,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Toegangsweg"
@@ -18339,5 +18551,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Een toegangsweg bewerken"
@@ -18347,18 +18559,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "oprit"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18366,5 +18578,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Parkeergang"
@@ -18374,5 +18586,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Een parkeergang bewerken"
@@ -18380,5 +18592,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -18387,5 +18599,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -18394,20 +18606,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
@@ -18415,9 +18627,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Toegang"
 
 #. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
 #. item "Highways/Streets/Road Restrictions" combo "Bicycle"
 #. item "Highways/Streets/Road Restrictions" combo "Foot"
@@ -18428,6 +18641,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18439,4 +18650,5 @@
 #. item "Ways/Path" combo "Snowmobile"
 #. item "Ways/Path" combo "Motorcar"
+#. item "Waypoints/Traffic Calming" combo "Type"
 #. item "Car/Parking" combo "Park and Ride"
 #. item "Car/Parking" combo "Fee"
@@ -18455,141 +18667,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ja"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privé"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "bestemmingsverkeer"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "bestemming"
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "toestemming"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "landbouw"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ja"
-
-#. color permissive
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="private"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privé"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "bestemmingsverkeer"
-
-#. color private
-#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="destination"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "bestemming"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "toestemming"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "landbouw"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nee"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Goederen"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
@@ -18604,10 +18824,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 build/trans_presets.java:784
+#: build/trans_presets.java:806 build/trans_presets.java:843
+#: build/trans_presets.java:856 build/trans_presets.java:868
+#: build/trans_presets.java:880 build/trans_presets.java:892
+#: build/trans_presets.java:932
 msgid "Horse"
 msgstr "Ruiters"
@@ -18623,10 +18843,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -18641,27 +18861,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: build/trans_presets.java:786 build/trans_presets.java:808
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:894 build/trans_presets.java:934
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorboot"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Pleziervaart"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -18669,25 +18881,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. hoogte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. breedte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. lengte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -18698,5 +18910,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -18716,10 +18928,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autosnelweg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -18741,10 +18953,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "autoweg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -18766,10 +18978,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "provinciale weg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -18791,5 +19003,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18804,9 +19016,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -18820,9 +19032,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "woongebied"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "woonerf"
@@ -18852,10 +19064,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "toegangsweg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -18885,5 +19097,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18895,10 +19107,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -18906,19 +19118,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Wegen"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Werkzaamheden"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Een autosnelweg met werkzaamheden bewerken"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Splitsing"
@@ -18934,5 +19146,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rotonde"
@@ -18940,5 +19152,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Track"
@@ -18947,40 +19159,34 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Track bewerken"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Track"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "gravel"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18988,5 +19194,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18994,37 +19200,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Bergwandelen"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Bergwandelen (stevig)"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Bergklimmen"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Bergklimmen (stevig)"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Bergklimmen (moeilijk)"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Pad"
@@ -19033,12 +19234,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Rolstoel"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19054,7 +19275,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Ruiterpad bewerken"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19067,7 +19287,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Fietspad bewerken"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19102,24 +19321,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Toch combineren"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Voetpad bewerken"
+msgstr ""
 
 #. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -19127,5 +19343,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Trap"
@@ -19135,5 +19351,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
@@ -19141,10 +19357,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -19152,15 +19368,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Diensten"
@@ -19168,5 +19384,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -19174,5 +19390,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19205,17 +19422,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Bedrijf"
@@ -19224,5 +19441,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -19232,5 +19449,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -19239,27 +19456,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "eiland"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "ongemarkeerd"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -19267,6 +19484,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -19275,11 +19492,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19287,30 +19504,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelicaan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19318,5 +19535,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -19325,14 +19542,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -19343,14 +19606,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "met de klok mee"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -19360,26 +19623,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Stadsgrens"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
 
 #. item "Waypoints/Speed Camera"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -19387,5 +19652,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19393,5 +19658,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19399,11 +19664,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+msgid "Grit Bin"
+msgstr ""
+
+#. item "Waypoints/Grit Bin"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
+#. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -19411,5 +19683,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -19417,5 +19689,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -19427,7 +19699,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Stijging"
@@ -19435,5 +19707,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barrières"
@@ -19441,5 +19713,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -19447,5 +19719,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -19490,16 +19762,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19508,5 +19780,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Blok"
@@ -19514,5 +19786,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -19520,10 +19792,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -19531,15 +19803,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -19547,5 +19819,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -19553,10 +19825,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -19566,5 +19838,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Haag"
@@ -19573,12 +19845,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Hek"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Muur"
@@ -19586,5 +19870,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -19593,5 +19877,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -19603,15 +19887,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Poort"
@@ -19619,50 +19904,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Overstap"
@@ -19670,25 +19955,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -19699,11 +19984,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Bron"
@@ -19711,5 +19996,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Bron bewerken"
@@ -19717,5 +20002,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Sloot"
@@ -19723,10 +20008,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Stroom"
@@ -19734,10 +20030,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanaal"
@@ -19745,10 +20041,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Rivier"
@@ -19758,5 +20054,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -19764,15 +20060,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Land bewerken"
@@ -19780,15 +20076,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -19796,15 +20092,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -19812,5 +20108,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -19819,10 +20115,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Drasland"
@@ -19833,14 +20129,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "veen"
@@ -19854,35 +20150,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Modder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strand"
@@ -19890,20 +20186,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Baai"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Klif"
@@ -19911,10 +20207,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -19922,5 +20218,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
@@ -19928,5 +20224,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -19934,5 +20230,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -19941,5 +20237,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -19947,10 +20243,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dok"
@@ -19958,5 +20254,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Dok bewerken"
@@ -19964,5 +20260,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Dam"
@@ -19970,15 +20266,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Waterwegpunt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -19987,5 +20283,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Stuw"
@@ -19993,20 +20289,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -20015,15 +20311,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Pier"
@@ -20031,10 +20327,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -20042,10 +20338,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -20055,20 +20351,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Spoor"
@@ -20076,5 +20372,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -20083,139 +20379,378 @@
 #. <space />
 #. <key key="railway" value="rail" />
+#. <optional>
 #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
+#. <optional>
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. <optional>
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. <optional>
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. <optional>
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. <optional>
+#: build/trans_presets.java:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standaard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <optional>
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+msgid "Types"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
+#. item "Transport/Railway/Monorail" combo "Types"
+#. item "Transport/Railway/Preserved" combo "Types"
+#. item "Transport/Railway/Light Rail" combo "Types"
+#. item "Transport/Railway/Subway" combo "Types"
+#. item "Transport/Railway/Tram" combo "Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "tuin"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "nevenweg"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "privéoprit"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "Electrified"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Electrified"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified"
+#. item "Transport/Railway/Monorail" combo "Electrified"
+#. item "Transport/Railway/Preserved" combo "Electrified"
+#. item "Transport/Railway/Light Rail" combo "Electrified"
+#. item "Transport/Railway/Subway" combo "Electrified"
+#. item "Transport/Railway/Tram" combo "Electrified"
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "contact_line"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "spoor"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Voltage"
+
+#. item "Transport/Railway/Rail" combo "Voltage"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Voltage"
+#. item "Transport/Railway/Monorail" combo "Voltage"
+#. item "Transport/Railway/Preserved" combo "Voltage"
+#. item "Transport/Railway/Light Rail" combo "Voltage"
+#. item "Transport/Railway/Subway" combo "Voltage"
+#. item "Transport/Railway/Tram" combo "Voltage"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Smalspoor"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Smalspoor bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Monorail bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Museumspoor"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Een museumspoorweg bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Sneltram"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Sneltram bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Metro bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tram"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Tram bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Busbaan"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Busbaan bewerken"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Ongebruikt spoor"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Ongebruikt spoor bewerken"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Optionele soorten"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "tuin"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "nevenweg"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "privéoprit"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Smalspoor"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Smalspoor bewerken"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Monorail bewerken"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Museumspoor"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Een museumspoorweg bewerken"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Sneltram"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Sneltram bewerken"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Metro bewerken"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tram"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Tram bewerken"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Busbaan"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Busbaan bewerken"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Ongebruikt spoor"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Ongebruikt spoor bewerken"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -20224,5 +20759,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -20231,5 +20766,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -20239,5 +20774,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20245,5 +20780,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -20252,10 +20787,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+msgid "Buffer Stop"
+msgstr ""
+
+#. item "Transport/Railway/Buffer Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
+#. <key key="railway" value="buffer_stop" />
+#: build/trans_presets.java:1289
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -20263,10 +20805,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -20274,10 +20816,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -20285,10 +20827,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20296,10 +20838,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20307,12 +20849,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Brandstof"
@@ -20322,9 +20877,66 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20378,32 +20990,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: 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:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -20462,94 +21074,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: 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:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: 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:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: 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:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20561,5 +21249,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20569,5 +21257,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -20578,25 +21266,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referentienummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "oppervlak"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20605,48 +21293,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Garage"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
@@ -20654,5 +21342,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Verhuur"
@@ -20661,10 +21349,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Autodelen"
@@ -20672,5 +21360,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
@@ -20678,10 +21366,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capaciteit"
@@ -20690,15 +21378,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20708,5 +21396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20714,5 +21402,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -20720,5 +21408,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -20726,5 +21414,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -20732,5 +21420,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -20739,5 +21427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -20745,5 +21433,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Perron"
@@ -20752,5 +21440,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -20762,5 +21450,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -20768,10 +21456,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -20780,10 +21468,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -20792,5 +21480,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Busstation"
@@ -20799,5 +21487,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -20805,5 +21493,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -20813,5 +21501,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -20820,25 +21508,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Schuilplaats"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bank"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -20846,5 +21535,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -20852,5 +21541,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -20858,32 +21547,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Luchthaven"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+msgid "Edit Helipad"
+msgstr ""
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
+msgid "Apron"
+msgstr ""
+
+#. item "Airport/Apron" label "Apron"
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+msgid "Hangar"
+msgstr ""
+
+#. item "Airport/Hangar" label "Hangar"
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Baken"
+
+#. item "Airport/Beacon" label "Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#: build/trans_presets.java:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -20895,5 +21679,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -20902,15 +21686,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -20918,20 +21702,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Chalet"
@@ -20939,10 +21723,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostel"
@@ -20950,30 +21734,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -20981,10 +21765,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -20995,5 +21779,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -21001,5 +21785,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -21007,5 +21791,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Keuken"
@@ -21013,61 +21797,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -21075,9 +21871,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -21085,9 +21889,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Kroeg"
@@ -21095,18 +21899,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -21114,9 +21918,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -21124,24 +21928,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -21149,9 +21953,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -21160,9 +21964,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -21170,24 +21974,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -21195,5 +21999,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -21201,19 +22005,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21251,5 +22055,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21257,28 +22061,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21288,5 +22092,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21294,5 +22098,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Wandelen"
@@ -21300,6 +22104,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Fietsen"
@@ -21307,5 +22111,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21313,6 +22117,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skiën"
@@ -21320,5 +22124,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21326,46 +22130,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21373,29 +22177,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -21403,25 +22207,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Kasteel"
@@ -21430,19 +22234,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -21451,9 +22255,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -21461,10 +22265,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21472,5 +22276,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21478,15 +22282,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -21494,55 +22298,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Speelveld"
@@ -21550,35 +22354,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -21592,6 +22396,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -21983,6 +22787,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22016,225 +22820,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -22273,21 +23077,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "soort"
@@ -22326,203 +23130,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -22530,56 +23334,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Schieten"
@@ -22587,182 +23387,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Gebouw"
@@ -22770,5 +23570,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -22776,10 +23576,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -22787,10 +23587,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassade"
@@ -22798,10 +23598,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -22810,10 +23610,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Gevangenis"
@@ -22822,10 +23622,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Politie"
@@ -22835,10 +23635,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -22847,10 +23647,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -22858,5 +23658,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -22864,15 +23664,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "School"
@@ -22880,10 +23680,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universiteit"
@@ -22891,10 +23691,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Campus"
@@ -22902,5 +23702,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -22908,5 +23708,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -22915,10 +23715,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliotheek"
@@ -22927,9 +23727,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -22937,10 +23737,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Theater"
@@ -22949,10 +23749,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -22962,5 +23762,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -22969,6 +23769,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religie"
@@ -22977,66 +23777,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Benaming"
@@ -23045,81 +23845,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adressen"
@@ -23128,5 +23928,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -23134,5 +23934,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Huisnummer"
@@ -23140,25 +23940,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Straatnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Landcode"
@@ -23167,5 +23967,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -23173,61 +23973,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23235,25 +24035,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -23261,10 +24061,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Windmolen"
@@ -23272,10 +24072,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -23284,37 +24084,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -23324,10 +24124,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Kraan"
@@ -23335,21 +24135,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Baken"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -23357,10 +24152,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -23368,11 +24163,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -23382,35 +24189,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -23419,10 +24226,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -23431,5 +24238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -23437,10 +24244,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -23451,23 +24258,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -23476,79 +24283,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Voltage"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefoon"
@@ -23557,5 +24359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -23563,5 +24365,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Munten"
@@ -23569,5 +24371,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Briefgeld"
@@ -23575,5 +24377,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -23581,5 +24383,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -23587,15 +24389,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recycling"
@@ -23604,5 +24406,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -23610,63 +24412,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Schroot"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
+msgstr ""
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23745,5 +24558,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -23753,31 +24566,31 @@
 msgstr "groen"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -23786,30 +24599,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontein"
@@ -23818,10 +24631,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -23830,10 +24643,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+msgid "Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+#: build/trans_presets.java:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23841,15 +24667,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23857,10 +24683,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23869,28 +24695,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23898,9 +24724,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23908,27 +24734,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -23936,5 +24762,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -23942,88 +24768,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Slager"
@@ -24031,9 +24857,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Bakker"
@@ -24041,9 +24867,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Bloemist"
@@ -24051,18 +24877,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -24070,54 +24896,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -24125,9 +24951,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -24135,9 +24961,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -24145,54 +24971,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -24200,9 +25026,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Wasserette"
@@ -24210,9 +25036,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -24220,28 +25046,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -24249,14 +25075,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -24264,5 +25090,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -24270,15 +25096,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Huisarts"
@@ -24286,18 +25112,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -24305,5 +25131,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -24311,9 +25137,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -24321,10 +25147,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -24333,5 +25159,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -24340,20 +25166,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -24361,5 +25187,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -24368,64 +25194,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Locaties"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Provincie"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Regio"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24433,15 +25259,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Dorp"
@@ -24449,10 +25275,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -24460,25 +25286,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -24486,5 +25312,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24492,10 +25318,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Eiland"
@@ -24503,10 +25329,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24514,5 +25340,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24520,5 +25346,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -24526,10 +25352,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Bergtop"
@@ -24537,10 +25363,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -24548,10 +25374,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -24559,70 +25385,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Boom"
@@ -24631,15 +25457,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Bos"
@@ -24648,5 +25474,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -24654,17 +25480,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Bosbouw"
@@ -24673,14 +25499,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -24688,25 +25514,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24714,10 +25540,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Heide"
@@ -24725,5 +25551,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -24731,5 +25557,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -24738,45 +25564,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -24784,25 +25610,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -24810,10 +25636,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Algemeen"
@@ -24821,20 +25647,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -24842,5 +25668,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -24848,15 +25674,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -24864,9 +25690,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -24874,39 +25700,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24914,15 +25740,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -24930,50 +25756,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
@@ -24983,5 +25809,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -24990,10 +25816,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "binnensegment"
@@ -25001,5 +25827,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -25008,5 +25834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -25014,34 +25840,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -25050,15 +25876,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "naar weg"
@@ -25066,5 +25892,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -25073,5 +25899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -25079,5 +25905,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -25168,5 +25994,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25176,17 +26002,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25246,5 +26072,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25253,9 +26079,9 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "omweg"
@@ -25269,10 +26095,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25280,31 +26106,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -25313,107 +26139,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr ""
-
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_style.java:72
-msgid "standard"
-msgstr "standaard"
 
 #. mappaint style named "standard"
@@ -25831,5 +26582,5 @@
 #: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
-msgstr ""
+msgstr "barrière"
 
 #. color barrier
@@ -25949,77 +26700,4 @@
 msgid "highway_track"
 msgstr "snelwegroute"
-
-#. color foot
-#. <icon annotate="true" src="transport/steps.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="bus_guideway"/>
-#. color railwaypoint
-#. <icon annotate="true" src="vehicle/crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="rail"/>
-#. color oldrail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="narrow_gauge"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="monorail"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="turntable"/>
-#. <icon annotate="true" src="transport/turntable.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="buffer_stop"/>
-#. <icon annotate="true" src="transport/buffer_stop.png"/>
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="platform"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. color rail
-#. color rail
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="funicular"/>
-#: build/trans_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "spoor"
 
 #. color rail
@@ -26407,7 +27085,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Baptist"
+msgstr ""
 
 #. color manmade
@@ -29546,91 +30223,15 @@
 msgstr "Sicilië - Italië"
 
-#~ msgid "Bridleway"
-#~ msgstr "Ruiterpad"
-
-#~ msgid "Cycleway"
-#~ msgstr "Fietspad"
-
-#~ msgid "Footway"
-#~ msgstr "Voetpad"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track (klasse 1)"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Klasse-1-track bewerken"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track (klasse 2)"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Klasse-2-track bewerken"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track (klasse 3)"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Klasse-3-track bewerken"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track (klasse 4)"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Klasse-4-track bewerken"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track (klasse 5)"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Klasse-5-track bewerken"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Wandelen bewerken"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Bergwandelen bewerken"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Bergwandelen (stevig) bewerken"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Bergklimmen bewerken"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Bergklimmen (stevig) bewerken"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Bergklimmen (moeilijk) bewerken"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 benodigd, kreeg {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' mag niet null zijn"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
-#~ "gegevensgebied.\n"
-#~ "Hierdoor kunnen knopen onbedoeld gewist worden.\n"
-#~ "Weet je zeker dat je verder wilt gaan?"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Tegenstrijdigheden in de gegevens"
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecteer eerst een bladwijzer."
+
+#~ msgid "Load Selection"
+#~ msgstr "Selectie laden"
+
+#~ msgid "Downloading..."
+#~ msgstr "Downloaden..."
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
 
 #~ msgid "image"
@@ -29638,16 +30239,4 @@
 #~ msgstr[0] "afbeelding"
 #~ msgstr[1] "afbeeldingen"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecteer eerst een bladwijzer."
-
-#~ msgid "Load Selection"
-#~ msgstr "Selectie laden"
-
-#~ msgid "Downloading..."
-#~ msgstr "Downloaden..."
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
 
 #~ msgid "Unknown version"
@@ -29936,7 +30525,4 @@
 #~ msgid "Only one node selected"
 #~ msgstr "Slechts één knoop geselecteerd"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken."
 
 #~ msgid ""
@@ -30093,4 +30679,14 @@
 #~ msgstr "Navigatie"
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
+#~ "gegevensgebied.\n"
+#~ "Hierdoor kunnen knopen onbedoeld gewist worden.\n"
+#~ "Weet je zeker dat je verder wilt gaan?"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
@@ -30128,4 +30724,19 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Valideer de huidige selectie of de totale gegevensset."
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorboot"
+
+#~ msgid "Boat"
+#~ msgstr "Pleziervaart"
+
+#~ msgid "Bridleway"
+#~ msgstr "Ruiterpad"
+
+#~ msgid "Cycleway"
+#~ msgstr "Fietspad"
+
+#~ msgid "Footway"
+#~ msgstr "Voetpad"
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
@@ -30195,4 +30806,16 @@
 #~ msgstr "aquaduct"
 
+#~ msgid "Edit Hiking"
+#~ msgstr "Wandelen bewerken"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Bergwandelen bewerken"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Bergwandelen (stevig) bewerken"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Bergklimmen bewerken"
+
 #~ msgid "Drawbridge"
 #~ msgstr "Kabelbrug"
@@ -30297,7 +30920,4 @@
 #~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
 
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Ingevoerde tijd kon niet worden ontleed."
-
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Loginnaam (e-mail) van het OSM-account."
@@ -30346,7 +30966,4 @@
 #~ msgstr "Oberpfalz Geofabrik.de"
 
-#~ msgid "Station"
-#~ msgstr "Station"
-
 #~ msgid "Shop"
 #~ msgstr "Winkel"
@@ -30366,7 +30983,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "fietskaart"
-
-#~ msgid "board"
-#~ msgstr "bord"
 
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
@@ -30396,9 +31010,21 @@
 #~ msgstr "Syncroniseer tijd met GPS-apparaat"
 
+#~ msgid "Track Grade 1"
+#~ msgstr "Track (klasse 1)"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Track (klasse 2)"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track (klasse 3)"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Track (klasse 4)"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Track (klasse 5)"
+
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Openbaar"
 
 #~ msgid "Download Image from french Cadastre WMS"
@@ -30516,4 +31142,25 @@
 #~ "of gedownload?"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Klasse-1-track bewerken"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Klasse-2-track bewerken"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Klasse-3-track bewerken"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Klasse-4-track bewerken"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Klasse-5-track bewerken"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Bergklimmen (stevig) bewerken"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Bergklimmen (moeilijk) bewerken"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Kabelbrug bewerken"
@@ -30540,4 +31187,7 @@
 #~ msgstr "parameter '{0}' mag niet leeg zijn"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -30547,4 +31197,7 @@
 #~ "is {1}"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Tegenstrijdigheden in de gegevens"
+
 #~ msgid "No data"
 #~ msgstr "Geen gegevens"
@@ -30556,4 +31209,7 @@
 #~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kan \"{0}\" niet lezen"
@@ -30565,4 +31221,7 @@
 #~ msgstr "Upload naar OSM API gefaald"
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' mag niet null zijn"
+
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien"
@@ -30574,6 +31233,15 @@
 #~ msgstr "Error tijdens het communiceren met de server."
 
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Id > 0 benodigd, kreeg {0}"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
+
 #~ msgid "Updating primitive"
 #~ msgstr "Aanpassen primitief"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
 
 #~ msgid "At least one object to delete requird, got empty collection"