Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 21560)
+++ applications/editors/josm/i18n/po/nl.po	(revision 21603)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-02 10:51+0200\n"
-"PO-Revision-Date: 2010-06-01 18:41+0000\n"
+"POT-Creation-Date: 2010-06-05 23:12+0200\n"
+"PO-Revision-Date: 2010-06-02 13:33+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-06-02 08:37+0000\n"
+"X-Launchpad-Export-Date: 2010-06-07 06:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -265,6 +265,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -320,9 +320,9 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
-msgstr ""
-"<html>Er zijn geen lagen waarmee de bron laag<br>''{0}''<br> kan samenvoegen."
-"</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
+"to.</html>"
+msgstr ""
+"<html>Er zijn geen lagen waarmee de bron laag<br>''{0}''<br> kan "
+"samenvoegen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -345,9 +345,9 @@
 #. Add extra shortcut C-S-a
 #. Add extra shortcut ESCAPE
-#.
+#. 
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -438,6 +438,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:933
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
@@ -654,12 +654,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
@@ -903,5 +903,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
-msgstr "Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
+msgstr ""
+"Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
@@ -1356,6 +1357,6 @@
 "orthogonalize them one by one.</html>"
 msgstr ""
-"<html>Zorg a.u.b. dat alle geselecteerde wegen dezelfde richting wijzen."
-"<br>of zet ze één voor één orthogonaal.</html>"
+"<html>Zorg a.u.b. dat alle geselecteerde wegen dezelfde richting "
+"wijzen.<br>of zet ze één voor één orthogonaal.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
@@ -1455,5 +1456,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1474,5 +1476,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1624,5 +1626,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
-msgid "Show status report with useful information that can be attached to bugs"
+msgid ""
+"Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden"
@@ -1645,5 +1648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1794,6 +1797,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
-"<html>Een relatie lidmaatschap is gekopieerd naar alle nieuwe wegen."
-"<br>Controleer dit en corrigeer dit waar nodig.</html>"
+"<html>Een relatie lidmaatschap is gekopieerd naar alle nieuwe "
+"wegen.<br>Controleer dit en corrigeer dit waar nodig.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1854,5 +1857,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "* One node that is used by more than one way and one of those ways, or"
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of"
@@ -1927,9 +1931,9 @@
 
 #. Add extra shortcut ESCAPE
-#.
+#. 
 #. * FIXME: this isn't optimal. In a better world the mapmode actions
 #. * would be able to capture keyboard events and react accordingly. But
 #. * for now this is a reasonable approximation.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
@@ -1946,5 +1950,5 @@
 
 #. bounds defined? => use the bbox downloader
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
@@ -2239,7 +2243,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
-msgid "Errors during Download"
-msgstr "Fouten tijdens download"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Fouten tijdens ophalen"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2273,7 +2277,7 @@
 msgstr "({0}/{1}) Laden van ouders van relatie {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
-msgid "Errors during download"
-msgstr "Fouten tijdens ophalen"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2409,6 +2413,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
 msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; "
+"SHIFT+release to synchronize audio at that point."
 msgstr ""
 "Afspeelstart verslepen en loslaten nabij track om het geluid vanaf daar af "
@@ -2537,110 +2541,111 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
 
 #. -- prepare the combo box with the search expressions
-#.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#. 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a filter string."
 msgstr "Geef een filter string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "Please enter a search string."
 msgstr "Voer een zoekopdracht in:"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
 msgid "Enter the search expression"
 msgstr "Geef de zoekterm"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
 msgid "replace selection"
 msgstr "Selectie vervangen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "add to selection"
 msgstr "Toevoegen aan selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "remove from selection"
 msgstr "Verwijderen uit selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "find in selection"
 msgstr "zoek in selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
 msgid "case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "regular expression"
 msgstr "Reguliere expressie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgstr ""
+"<b>Lange straat</b> - ''Lange'' en ''straat'' in een sleutel of naam."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Lange</b> - ''Lang'' ergens in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - sleutel ''type'' met exacte waarde ''route''."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>type=*</b> - sleutel ''type'' met elke waarde. Probeer ook <b>*=value</"
-"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+"<b>type=*</b> - sleutel ''type'' met elke waarde. Probeer ook "
+"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Lange</b> - geen ''Lang'' in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - sleutel=foot, met een willekeurige waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciale zoekopdrachten:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - objecttype (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>gebruiker:</b>... - alle objecten veranderd door gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>user:anonymous</b> - alle objekten gewijzigd door anonieme gebruikers"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt met opgegeven ID (0 voor nieuwe objekten)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2648,5 +2653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2654,11 +2659,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or "
+"nodes:min-max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2668,5 +2673,9 @@
 "max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2674,21 +2683,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle aangepaste objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle geselecteerde objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle incomplete objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>ongetagd</b> - alle objecten zonder tag"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2697,5 +2706,5 @@
 "voldoen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2704,13 +2713,13 @@
 "voldoen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2718,11 +2727,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Gebruik <b>(</b> en <b>)</b> om expressies te groeperen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2730,38 +2739,38 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Submit filter"
 msgstr "Aktiveer filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 msgid "Start Search"
 msgstr "Start zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Geen overeenkomst gevonden voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Niets gevonden in selectie met zoeken op \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
 #, java-format
 msgid "Found {0} matches"
@@ -2769,5 +2778,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
 msgctxt "search"
 msgid "CS"
@@ -2775,5 +2784,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 msgctxt "search"
 msgid "CI"
@@ -2781,5 +2790,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 msgctxt "search"
 msgid "RX"
@@ -2798,5 +2807,13 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2804,10 +2821,5 @@
 "van gebruik: sleutel=waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr "Patroon syntax fout: Patroon {0} in {1} is illegaal!"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2815,36 +2827,36 @@
 "Onbekende primitief: {0}. Toegestane waarden zijn knoop, weg of relatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Onverwacht token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 msgid "Missing parameter for OR"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 msgid "Missing operator for NOT"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 msgid "Primitive id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
 msgid "Range of numbers expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
 msgid "Changeset id expected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
 msgid "Version expected"
 msgstr ""
@@ -2915,5 +2927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
@@ -3026,6 +3038,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>Laag ''{0}'' heeft reeds een conflikt voor primitief<br>''{1}''."
-"<br>Dit conflikt kan niet worden toegevoegd.</html>"
+"<html>Laag ''{0}'' heeft reeds een conflikt voor "
+"primitief<br>''{1}''.<br>Dit conflikt kan niet worden toegevoegd.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
@@ -3127,7 +3139,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you do not see) "
-"might use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have "
+"downloaded.<br>This can cause problems because other objects (that you do "
+"not see) might use them.<br>Do you really want to delete?"
 msgstr ""
 "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
@@ -3398,6 +3410,6 @@
 #, java-format
 msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
+"<html>Preferences file had errors.<br> Making backup of old one to "
+"<br>{0}<br> and creating a new default preference file.</html>"
 msgstr ""
 
@@ -3480,5 +3492,5 @@
 #. *
 #. * the decimal format 999.999
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3487,5 +3499,5 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3494,5 +3506,5 @@
 #. *
 #. * coordinates East/North
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
@@ -3529,5 +3541,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
 #, java-format
 msgid ""
@@ -3580,5 +3592,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:346
 msgctxt "filter"
 msgid "E"
@@ -3586,5 +3598,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:347
 msgctxt "filter"
 msgid "H"
@@ -3592,17 +3604,11 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:348
 msgctxt "filter"
 msgid "Text"
 msgstr "tekst"
 
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
-msgctxt "filter"
-msgid "C"
-msgstr ""
-
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:349
 msgctxt "filter"
 msgid "I"
@@ -3610,5 +3616,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:350
 msgctxt "filter"
 msgid "M"
@@ -3617,5 +3623,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:412
 msgctxt "filter"
 msgid "R"
@@ -3623,5 +3629,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:413
 msgctxt "filter"
 msgid "A"
@@ -3629,5 +3635,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:414
 msgctxt "filter"
 msgid "D"
@@ -3635,42 +3641,42 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:415
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:445
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:451
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:459
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:462
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:498
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:555
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:557
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:777
 #, java-format
 msgid ""
@@ -3679,5 +3685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1149
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3685,5 +3691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1151
 #, java-format
 msgid ""
@@ -3739,5 +3745,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
 #, java-format
-msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid ""
+"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3747,81 +3754,81 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:189
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:268
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:274
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:280
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:294
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:302
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:308
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:312
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:325
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
 msgid "The \"from\" way does not start or end at a \"via\" node."
 msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:329
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
 msgid "The \"to\" way does not start or end at a \"via\" node."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:360
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
 msgid "The \"from\" way does not start or end at the \"via\" way."
 msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:364
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
 msgid "The \"to\" way does not start or end at the \"via\" way."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:458
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stijl voor beperking {0} is niet gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:559
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Error: {0}"
 msgstr "Fout: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:757
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
 #, java-format
 msgid "Warning: {0}"
@@ -3995,5 +4002,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
 
@@ -4064,5 +4072,5 @@
 #. color tiger_data
 #. </rule>
-#.
+#. 
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -4072,5 +4080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -4079,5 +4087,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -4086,5 +4094,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -4093,5 +4101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -4100,5 +4108,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -4107,9 +4115,9 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--annotation tags -->
-#.
+#. 
 #. <!--"work in progress" tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="building"/>
@@ -4265,6 +4273,6 @@
 "filename"
 msgstr ""
-"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met "
-"lat=y&lon=x&zoom=z  of een bestandsnaam"
+"Alles downloaden. Mogelijkheden: x1,y1,x2,y2, een URL met lat=y&lon=x&zoom=z "
+" of een bestandsnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4430,6 +4438,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4444,4 +4452,5 @@
 msgstr "Bewerken"
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 #: build/specialmessages.java:38
@@ -4637,5 +4646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4674,6 +4683,6 @@
 "<html>Alternatively you may enter a <strong>tile address</strong> for a "
 "single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
+"too.</html>"
 msgstr ""
 
@@ -4704,5 +4713,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with their version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
@@ -4711,5 +4720,5 @@
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
@@ -4718,5 +4727,5 @@
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
@@ -4930,5 +4939,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
-msgid "Copy their selected elements to the end of the list of merged elements."
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 
@@ -4953,6 +4963,7 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 #: build/specialmessages.java:36
 msgid "Up"
@@ -4964,5 +4975,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Down"
 msgstr "Omlaag"
@@ -5007,6 +5018,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
 msgstr ""
 
@@ -5014,6 +5025,6 @@
 #, java-format
 msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
-"html>"
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
 msgstr ""
 
@@ -5064,6 +5075,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
+"<html>An error occurred while communicating with the server<br>Details: "
+"{0}</html>"
 msgstr ""
 
@@ -5280,6 +5291,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5292,6 +5303,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:527
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5589,7 +5600,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
 msgid ""
-"<html>Select to show changesets for the currently selected objects only."
-"<br>Unselect to show all changesets for objects in the current data layer.</"
-"html>"
+"<html>Select to show changesets for the currently selected objects "
+"only.<br>Unselect to show all changesets for objects in the current data "
+"layer.</html>"
 msgstr ""
 
@@ -5614,5 +5625,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
-msgid "Download information about the selected changesets from the OSM server"
+msgid ""
+"Download information about the selected changesets from the OSM server"
 msgstr ""
 
@@ -5630,6 +5642,5 @@
 msgstr ""
 
-#. relation type
-#. ** Strings in JFileChooser */
+#. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 #: build/specialmessages.java:21
@@ -5649,9 +5660,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 msgid "Open a list of all commands (undo buffer)."
-msgstr "Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)."
+msgstr ""
+"Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5659,5 +5671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5734,9 +5746,10 @@
 #, java-format
 msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<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>"
+"<html>You did not finish to merge the differences in this "
+"conflict.<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 ""
 
@@ -5754,13 +5767,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 msgid "Filter objects and hide/disable them."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1043
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
@@ -5769,45 +5782,41 @@
 msgstr "Toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:77
 msgid "Add filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:89
 msgid "Edit filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Delete filter."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter up."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:125
 msgid "Move filter down."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Enable filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
 msgid "Hide elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
-msgid "Apply also for children"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
 msgid "Inverse filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:143
 msgid "Filter mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:216
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
@@ -6034,10 +6043,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1095
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1096
 msgid "Select relation in relation list."
 msgstr ""
@@ -6091,5 +6100,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 msgid "Open a list of people working on the selected objects."
-msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken."
+msgstr ""
+"Een lijst openen met mensen die aan de geselecteerde objecten werken."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
@@ -6380,4 +6390,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
@@ -7491,6 +7502,6 @@
 #, java-format
 msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: {0}"
-"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
 
@@ -7514,8 +7525,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
 msgid ""
-"<html>Please select one the following <strong>standard queries</strong>."
-"Select <strong>Download my changesets only</strong> if you only want to "
-"download changesets created by yourself.<br>Note that JOSM will download "
-"max. 100 changesets.</html>"
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
 msgstr ""
 
@@ -7635,5 +7646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:187
 #, java-format
 msgid "This will change {0} object."
@@ -7642,23 +7653,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:189
 msgid "An empty value deletes the tag."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:394
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:312
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7667,5 +7678,5 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:352
 #, java-format
 msgid "This will change up to {0} object."
@@ -7674,77 +7685,81 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:379
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:474
 msgid "Please select the objects you want to change properties for."
 msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:523
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:522
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Member Of"
 msgstr "Lid van"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
+msgid "Position"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:931
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 #, 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:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
 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:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1013
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1044
 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:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 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:1024
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1092
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1093
 msgid "Select relation in main selection."
 msgstr ""
@@ -7859,6 +7874,6 @@
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is discouraged."
-"<br>How do you want to proceed with circular dependencies?</html>"
+"relation itself.<br>This creates circular dependencies and is "
+"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 
@@ -7876,6 +7891,6 @@
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
-"html>"
+"primitive ''{0}''<br><br>Do you really want to add another relation "
+"member?</html>"
 msgstr ""
 
@@ -8030,6 +8045,7 @@
 #, java-format
 msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+"<html>Layer ''{0}'' already has a conflict for "
+"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
+"again.</html>"
 msgstr ""
 
@@ -8342,5 +8358,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
-msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
+msgstr ""
+"Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
@@ -8365,6 +8382,7 @@
 #, java-format
 msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
+"enabled.<br>Please chose to either download OSM data, or GPX data, or "
+"both.</html>"
 msgstr ""
 
@@ -8424,4 +8442,5 @@
 msgstr ""
 
+#. Strings in JFileChooser
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
@@ -8504,6 +8523,6 @@
 "english.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
-"a>.</p></html>"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
+"english</a>.</p></html>"
 msgstr ""
 
@@ -8513,6 +8532,6 @@
 "<html><p class=\"error-header\">Error when retrieving help information</p><p "
 "class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
+"could not be loaded. The error message is "
+"(untranslated):<br><tt>{1}</tt></p></html>"
 msgstr ""
 
@@ -8786,17 +8805,18 @@
 "version of one<br>of your nodes, ways, or relations.<br>The conflict is "
 "caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
+"server has version {2}, your version is {3}.<br><br>Click "
+"<strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click "
+"<strong>{5}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{6}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Versturen <strong>mislukt</strong> omdat de server een nieuwere versie "
 "van een <br>van uw knooppunten, wegen, of relaties heeft gevonden.<br>Het "
-"conflict is veroorzaakt door de <strong>{0}</strong> met id <strong>{1}</"
-"strong>,<br>de server heeft versie {2}, uw versie is {3}.<br><br>Klik "
-"<strong>{4}</strong> om alleen het foutieve item te synchronizeren.<br>Klik "
-"<strong>{5}</strong> om de volledige dataset met de server te synchronizeren."
-"<br>Klik <strong>{6}</strong> om af te breken, en verder te gaan met "
-"aanpassingen.<br></html>"
+"conflict is veroorzaakt door de <strong>{0}</strong> met id "
+"<strong>{1}</strong>,<br>de server heeft versie {2}, uw versie is "
+"{3}.<br><br>Klik <strong>{4}</strong> om alleen het foutieve item te "
+"synchronizeren.<br>Klik <strong>{5}</strong> om de volledige dataset met de "
+"server te synchronizeren.<br>Klik <strong>{6}</strong> om af te breken, en "
+"verder te gaan met aanpassingen.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8810,13 +8830,14 @@
 msgid ""
 "<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
+"version of one<br>of your nodes, ways, or relations.<br><br>Click "
+"<strong>{0}</strong> to synchronize the entire local dataset with the "
+"server.<br>Click <strong>{1}</strong> to abort and continue "
+"editing.<br></html>"
 msgstr ""
 "<html>Versturen <strong>mislukt</strong> omdat de server een nieuwere versie "
-"van een <br>van uw knooppunten, wegen of relaties heeft gevonden."
-"<br><br>Klik <strong>{0}</strong> om de volledige dataset te synchronizeren "
-"met de server.<br>Klik <strong>{1}</strong> om af te breken, en verder te "
-"gaan met aanpassingen.<br></html>"
+"van een <br>van uw knooppunten, wegen of relaties heeft "
+"gevonden.<br><br>Klik <strong>{0}</strong> om de volledige dataset te "
+"synchronizeren met de server.<br>Klik <strong>{1}</strong> om af te breken, "
+"en verder te gaan met aanpassingen.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
@@ -8857,8 +8878,8 @@
 msgstr ""
 "<html>Versturen <strong>mislukt </strong> omdat u node {0} probeerde te "
-"verwijderen. Deze is nog in gebruik in weg {1}.<br><br>Klik <strong>{2}</"
-"strong> om alle ouder wegen op te halen van knooppunt {0}.<br>Indien nodig "
-"zal JOSM conflikten aanmaken die u kunt oplossen met behulp van het Conflikt "
-"Oplossen venster.</html>"
+"verwijderen. Deze is nog in gebruik in weg {1}.<br><br>Klik "
+"<strong>{2}</strong> om alle ouder wegen op te halen van knooppunt "
+"{0}.<br>Indien nodig zal JOSM conflikten aanmaken die u kunt oplossen met "
+"behulp van het Conflikt Oplossen venster.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -8870,5 +8891,6 @@
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon"
+msgstr ""
+"Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
@@ -9059,5 +9081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -9074,5 +9096,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
-msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgid ""
+"Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
@@ -9157,6 +9180,6 @@
 msgid_plural ""
 "<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a file:</"
-"html>"
+"file for each of them or discard the changes.<br>Layers without a "
+"file:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9170,6 +9193,6 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
-"written.<br>Either select another file for this layer or discard the changes."
-"<br>Layer with a non-writable file:</html>"
+"written.<br>Either select another file for this layer or discard the "
+"changes.<br>Layer with a non-writable file:</html>"
 msgid_plural ""
 "<html>{0} layers need saving but have associated files<br>which cannot be "
@@ -9395,5 +9418,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
@@ -9419,5 +9442,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
-msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgid ""
+"The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
 
@@ -9472,6 +9496,6 @@
 #, java-format
 msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
-"strong> using <strong>{1} requests</strong>"
+"Uploading <strong>{0} objects</strong> to <strong>multiple "
+"changesets</strong> using <strong>{1} requests</strong>"
 msgstr ""
 
@@ -9525,7 +9549,7 @@
 msgid ""
 "Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
-"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
-"editing.<br>"
+"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload "
+"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
+"map editing.<br>"
 msgstr ""
 
@@ -9535,5 +9559,5 @@
 
 #. we tried to delete an already deleted primitive.
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
@@ -9560,5 +9584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgid ""
+"Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
 "Negeer uitzondering omdat versturen afgebroken is. De uitzondering is: {0}"
@@ -9777,7 +9802,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points do not include a timestamp we cannot "
+"correlate them with audio data.</html>"
 msgstr ""
 
@@ -9803,7 +9828,7 @@
 #, java-format
 msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
+"server.<br>Because its way points do not include a timestamp we cannot "
+"correlate them with images.</html>"
 msgstr ""
 
@@ -9867,6 +9892,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk "
@@ -9882,5 +9907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
 #, java-format
 msgid "Converted from: {0}"
@@ -10050,6 +10075,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:</html>"
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:</html>"
 msgstr ""
 
@@ -10109,7 +10134,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the time."
-"<br>Display that photo here.<br>And then, simply capture the time you read "
-"on the photo and select a timezone<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the "
+"time.<br>Display that photo here.<br>And then, simply capture the time you "
+"read on the photo and select a timezone<hr></html>"
 msgstr ""
 "<html>Maak een opname van je GPS-ontvanger met de tijd weergegeven.<br>Toon "
@@ -10179,64 +10204,68 @@
 msgstr "Automatisch schatten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+msgid "Matches first photo with first gpx point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
 msgid "Timezone: "
 msgstr "Tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
 msgid "Offset:"
 msgstr "Verschuiving:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
 msgid "Correlate images with GPX track"
 msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
 msgid "Correlate"
 msgstr "Correleer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
 msgid "Invalid offset"
 msgstr "Ongeldige verschuiving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10246,20 +10275,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tijdzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10268,5 +10297,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10274,21 +10303,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 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:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
 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:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
 msgid "Photos do not contain time information"
 msgstr "Foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10297,17 +10326,17 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
 msgid "GPX Track has no time information"
 msgstr "GPX-track heeft geen tijdinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
 msgid "You should select a GPX track"
 msgstr "U mag een GPX-track selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
 msgid "No selected GPX track"
 msgstr "Geen GPX-tracks geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
 #, java-format
 msgid ""
@@ -10318,5 +10347,5 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
 #, java-format
 msgid ""
@@ -10369,14 +10398,14 @@
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
 #, java-format
 msgid "{0} image loaded."
@@ -10385,5 +10414,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10392,10 +10421,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638
 #, java-format
 msgid ""
@@ -10404,5 +10433,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10561,5 +10590,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
 msgid "Toggle visible state of the marker text and icons."
-msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
+msgstr ""
+"Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -10696,6 +10726,6 @@
 "<html>Run a fully automatic procedure to get an access token from the OSM "
 "website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorizes the user and retrieves an Access Token.</"
-"html>"
+"fully<br>automatically authorizes the user and retrieves an Access "
+"Token.</html>"
 msgstr ""
 
@@ -10717,8 +10747,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
 msgid ""
-"Please enter your OSM user name and password. The password will <strong>not</"
-"strong> be saved in clear text in the JOSM preferences and it will be "
-"submitted to the OSM server <strong>only once</strong>. Subsequent data "
-"upload requests don't use your password any more."
+"Please enter your OSM user name and password. The password will "
+"<strong>not</strong> be saved in clear text in the JOSM preferences and it "
+"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
+"data upload requests don't use your password any more."
 msgstr ""
 
@@ -10838,6 +10868,6 @@
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
-"<br><br>Please check username and password and try again.</html>"
+"OSM server failed. JOSM failed to log into {0}<br>for user "
+"{1}.<br><br>Please check username and password and try again.</html>"
 msgstr ""
 
@@ -10947,5 +10977,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
-msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgid ""
+"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
@@ -11079,8 +11110,8 @@
 "authorization page in an external browser. Please login with your OSM "
 "username and password and follow the instructions to authorize the Request "
-"Token. Then switch back to this dialog and click on <strong>{0}</"
-"strong><br><br>If launching the external browser fails you can copy the "
-"following authorize URL and paste it into the address field of your browser."
-"</html>"
+"Token. Then switch back to this dialog and click on "
+"<strong>{0}</strong><br><br>If launching the external browser fails you can "
+"copy the following authorize URL and paste it into the address field of your "
+"browser.</html>"
 msgstr ""
 
@@ -11163,8 +11194,8 @@
 msgid ""
 "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, though."
-"<br>Depending on what rights are granted to this token you may nevertheless "
-"use it<br>to upload data, upload GPS traces, and/or access other protected "
-"resources.</html>"
+"test to retrieve the user details for this token failed, "
+"though.<br>Depending on what rights are granted to this token you may "
+"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
+"other protected resources.</html>"
 msgstr ""
 
@@ -11191,7 +11222,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
 msgid ""
-"<html>The test failed because the server responded with an internal error."
-"<br>JOSM could not decide whether the token is valid. Please try again later."
-"</html>"
+"<html>The test failed because the server responded with an internal "
+"error.<br>JOSM could not decide whether the token is valid. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -11262,34 +11293,31 @@
 msgstr "Live-geluidsspoor tonen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
-msgid "Create non-audio markers when reading GPX."
-msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
-
 #. various methods of making markers on import audio
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
 msgstr "Expliciete waypoints met geldige tijdsaanduiding."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr "Expliciete waypoints met tijdsschatting uit trackpositie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
 msgstr "Benoemde trackpunten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
 msgstr "Aangepaste tijden (tijdsmarkeringen) van geluidsbestanden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgstr ""
+"Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
 msgid "Show or hide the audio menu entry on the main menu bar."
 msgstr "De geluidsmenuitem op de hoofdmenubalk tonen of verbergen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
 msgid ""
 "Display a moving icon representing the point on the synchronized track where "
@@ -11299,5 +11327,5 @@
 "gesynchroniseerde track van het klinkende geluid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
 msgid ""
 "Put text labels against audio (and image and web) markers as well as their "
@@ -11307,24 +11335,16 @@
 "hun knoppictogrammen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
-"een GPX-laag."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
 msgid "When importing audio, make markers from..."
 msgstr "Bij importeren van geluid, maak markers van..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
 msgstr ""
 "Bij importeren van geluid, pas het toe op ieder waypoint in de GPX-laag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
 msgid ""
 "Automatically create audio markers from trackpoints (rather than explicit "
@@ -11334,5 +11354,5 @@
 "met namen of beschrijvingen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
 msgid ""
 "Create audio markers at the position on the track corresponding to the "
@@ -11342,5 +11362,5 @@
 "aangepast tijd van ieder geïmporteerd WAV-bestand."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
 msgid ""
 "The number of seconds to jump forward or back when the relevant button is "
@@ -11350,18 +11370,18 @@
 "knop wordt ingedrukt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
 msgid "Forward/back time (seconds)"
 msgstr "Vooruit-/achteruittijd (seconden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
 msgid "The amount by which the speed is multiplied for fast forwarding"
 msgstr ""
 "De waarde waarmee de snelheid is vermenigvuldigd voor snel doorspoelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
 msgid "Fast forward multiplier"
 msgstr "Versterkingsfactor snel doorspoelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
 msgid ""
 "Playback starts this number of seconds before (or after, if negative) the "
@@ -11371,14 +11391,14 @@
 "geluidsspoorpositie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "Lead-in time (seconds)"
 msgstr "Voorlooptijd (seconden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
 "De verhouding tussen verstreken tijd van de geluidsopname en de werkelijkheid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
 msgid "Voice recorder calibration"
 msgstr "Calibratie geluidsopname"
@@ -11418,5 +11438,5 @@
 msgstr "Kleuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11427,34 +11447,35 @@
 msgstr "Alles"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-msgid "Local files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "None"
 msgstr "Geen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 msgid "Force lines if no segments imported."
 msgstr "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Draw large GPS points."
 msgstr "Grote GPS-punten tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Snelheid (rood = langzaam, groen = snel)"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
-msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -11462,5 +11483,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11482,5 +11503,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11522,5 +11543,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11534,50 +11555,62 @@
 msgstr "Te voet"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Teken richting pijlen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw boundaries of downloaded data"
 msgstr "Grenzen gedownload gebied tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuele knopen in selectiemodus tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw inactive layers in other color"
 msgstr "Inactieve lagen in andere kleur tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Automatisch een markerlaag voor ieder waypoint maken tijdens het openen van "
+"een GPX-laag."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11585,9 +11618,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11596,10 +11629,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11608,11 +11641,12 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "De richtingspijlen tekenen door te zoeken in tabellen i.p.v. ingewikkelde "
@@ -11620,5 +11654,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11627,13 +11661,13 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11643,9 +11677,9 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11653,29 +11687,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
@@ -11683,10 +11718,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11694,9 +11729,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
 msgid "OSM Data"
 msgstr "OSM-gegevens"
@@ -11768,5 +11803,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
 #, java-format
-msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid ""
+"The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
@@ -11815,6 +11851,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:668
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:837
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
 msgid "Update plugins"
 msgstr ""
@@ -11891,6 +11927,6 @@
 "a menu entry of a button for the first time. So some of your changes may "
 "become active even without restart --- but also without collision handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes here."
-"</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes "
+"here.</p>"
 msgstr ""
 
@@ -11903,9 +11939,9 @@
 "keyboard do not have them, Sun keyboards do), then do not use it. Also there "
 "are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
-"'':''/Colon). Please do not use them either, use the base key ('';''/"
-"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
-"Not doing so may result in conflicts, as there is no way for JOSM to know "
-"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
-"p>"
+"'':''/Colon). Please do not use them either, use the base key "
+"('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) "
+"instead. Not doing so may result in conflicts, as there is no way for JOSM "
+"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
+"keyboard.</p>"
 msgstr ""
 
@@ -12051,5 +12087,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:151
 msgid "You have to restart JOSM for some settings to take effect."
-msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
+msgstr ""
+"U dient JOSM opnieuw te starten om sommige instellingen te activeren."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
@@ -12072,5 +12109,6 @@
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
+msgstr ""
+"De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
@@ -12205,6 +12243,6 @@
 #, java-format
 msgid ""
-"<html>Failed to load the list of style sources from<br>''{0}''."
-"<br><br>Details (untranslated):<br>{1}</html>"
+"<html>Failed to load the list of style sources "
+"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -12326,6 +12364,6 @@
 #, java-format
 msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API server."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"<html>Failed to build URL ''{0}'' for validating the OSM API "
+"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12347,6 +12385,6 @@
 msgid ""
 "<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of 200."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+"at<br>''{1}''. The server responded with the return code {0} instead of "
+"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
@@ -12425,5 +12463,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
-msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid ""
+"Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
 
@@ -12439,5 +12478,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
-msgid "You already have an Access Token to access the OSM server using OAuth."
+msgid ""
+"You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
 
@@ -12531,6 +12571,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
 msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
+"Use standard system settings (disabled. Start JOSM with <tt>-"
+"Djava.net.useSystemProxies=true</tt> to enable)"
 msgstr ""
 
@@ -12826,5 +12866,5 @@
 #. Just log something. The network stack will also throw an exception which will be caught
 #. somewhere else
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
@@ -13009,5 +13049,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
-msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgid ""
+"No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
 
@@ -13392,6 +13433,6 @@
 #, java-format
 msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
+"<html>An error occurred while restoring backup file.<br>Error "
+"is:<br>{0}</html>"
 msgstr ""
 
@@ -13419,6 +13460,6 @@
 #, java-format
 msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"Missing manadatory attributes on element ''bounds''. Got "
+"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -13460,5 +13501,6 @@
 #: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
-msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgid ""
+"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
@@ -13889,14 +13931,19 @@
 #, java-format
 msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
+"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
 #, java-format
 msgid ""
@@ -13905,23 +13952,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
 msgid "Loading plugins ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
 msgid "Checking plugin preconditions..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
 #, java-format
 msgid "Loading plugin ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
@@ -13929,5 +13971,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
@@ -13935,17 +13977,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
 msgid "Determine plugins to load..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
 msgid "Removing deprecated plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
 msgid "Removing unmaintained plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
@@ -13953,5 +13995,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13963,42 +14005,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
 msgid "Plugin update failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:644
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
 msgid "Warning: failed to download plugin information list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:710
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:725
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
 msgid "Disable plugin"
 msgstr "Plugin uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
 #, java-format
 msgid "Click to delete the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:716
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:814
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
 #, java-format
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:792
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:793
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:799
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
 #, java-format
 msgid ""
@@ -14007,5 +14049,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:798
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
 msgid ""
@@ -14014,23 +14056,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
 #, java-format
 msgid "Click to disable the plugin ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr ""
+"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de "
+"\"{0}\"-plugin."
+
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
-#, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
-"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de \"{0}"
-"\"-plugin."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Volgens de informatie in de plugin, is de auteur {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:829
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -14039,9 +14081,9 @@
 "fout rapporteert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:831
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
 msgid "Should the plugin be disabled?"
 msgstr "Moet de plugin worden uitgeschakeld?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:903
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -14051,14 +14093,14 @@
 "uit de applicatie te halen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:945
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:950
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
 msgid "no description available"
 msgstr "geen omschrijving beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:982
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
 msgid ""
 "Do not ask again and remember my decision (go to Preferences->Plugins to "
@@ -14099,5 +14141,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
 #, java-format
-msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid ""
+"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
 
@@ -14159,5 +14202,5 @@
 
 #. Then ask for submitting a bug report, for exceptions thrown from a plugin too
-#.
+#. 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
 msgid "Do nothing"
@@ -14240,6 +14283,6 @@
 msgid ""
 "<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
+"current<br>dataset violates a precondition.<br>The error message "
+"is:<br>{0}</html>"
 msgstr ""
 
@@ -14247,7 +14290,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' failed."
-"<br>Please check the username and the password in the JOSM preferences.</"
-"html>"
+"<html>Authentication at the OSM server with the username ''{0}'' "
+"failed.<br>Please check the username and the password in the JOSM "
+"preferences.</html>"
 msgstr ""
 
@@ -14255,7 +14298,7 @@
 #, java-format
 msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
+"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
+"token.</html>"
 msgstr ""
 
@@ -14263,8 +14306,8 @@
 #, java-format
 msgid ""
-"<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>"
+"<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>"
 msgstr ""
 
@@ -14284,7 +14327,7 @@
 msgid ""
 "<html>Communication with the OSM server ''{0}''failed. The server "
-"replied<br>the following error code and the following error message:"
-"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
-"strong>: {2}</html>"
+"replied<br>the following error code and the following error "
+"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
+"(untranslated)</strong>: {2}</html>"
 msgstr ""
 
@@ -14353,6 +14396,7 @@
 #, java-format
 msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+"<html>The OSM server<br>''{0}''<br>reported an internal server "
+"error.<br>This is most likely a temporary problem. Please try again "
+"later.</html>"
 msgstr ""
 
@@ -14364,7 +14408,7 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
 msgid ""
-"The area you tried to download is too big or your request was too large."
-"<br>Either request a smaller area or use an export file provided by the OSM "
-"community."
+"The area you tried to download is too big or your request was too "
+"large.<br>Either request a smaller area or use an export file provided by "
+"the OSM community."
 msgstr ""
 
@@ -14396,9 +14440,9 @@
 "<html>The server reports that an object is deleted.<br><strong>Uploading "
 "failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:394
+"<strong>Downloading failed</strong> if you tried to download this "
+"object.<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15032,5 +15076,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Replace original background by JOSM background color."
-msgstr "Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM."
+msgstr ""
+"Oorspronkelijke achtergrond vervangen door achtergrondkleur van JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
@@ -15061,7 +15106,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--waterway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -15071,5 +15116,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -15079,5 +15124,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="ditch"/>
@@ -15093,5 +15138,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -15101,5 +15146,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -15130,5 +15175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -15137,5 +15182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -15144,5 +15189,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -15151,5 +15196,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -15158,5 +15203,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -15165,5 +15210,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -15197,10 +15242,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+"A special handler of the French cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in French): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
 msgstr ""
 
@@ -15693,34 +15739,35 @@
 msgstr "Fout in buffer Lambert-zone"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
 msgid "Use"
 msgstr "Gebruik"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
 msgid "Please select a scheme to use."
 msgstr "Selecteer een schema om te gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
 msgid "Color Scheme"
 msgstr "Kleurenschema"
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
 msgid "Please select the scheme to delete."
 msgstr "Selecteer het schema om te verwijderen."
 
 #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
 msgid "Use the selected scheme from the list."
 msgstr "Het geselecteerde schema uit de lijst gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
 msgid "Use the current colors as a new color scheme."
 msgstr "De huidige kleuren als nieuw kleurenschema gebruiken."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
 msgid "Delete the selected scheme from the list."
 msgstr "Het geselecteerde schema uit de lijst verwijderen."
 
-#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
 msgid "Color Schemes"
 msgstr "Kleurenschema's"
@@ -15793,5 +15840,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15882,4 +15929,5 @@
 msgstr "Poort:"
 
+#. Strings in JFileChooser
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15945,6 +15993,6 @@
 msgstr ""
 "Kan bibliotheek rxtxSerial niet laden. Als je ondersteuning bij het "
-"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-mack.de/"
-"josm-globalsat-gpx-import-plugin/"
+"installeren nodig hebt, kijk dan op Globalsat: http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
@@ -16092,5 +16140,5 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#.
+#. 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
@@ -16211,5 +16259,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
@@ -16233,9 +16282,10 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
-msgstr ""
-"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in graden."
-"<br>Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. "
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
+msgstr ""
+"Nauwkeurigheid van de Douglas-Peucker lijnvereenvoudiging, gemeten in "
+"graden.<br>Lagere waarden resulteren in meer knopen en nauwkeurigere lijnen. "
 "Standaard 0.0003."
 
@@ -16359,5 +16409,6 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
+msgstr ""
+"Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
@@ -16532,7 +16583,7 @@
 "upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
-"<html>De geselecteerde gegevens bevatten gegevens van OpenStreetBugs."
-"<br>Deze gegevens kan je niet uploaden. Heb je misschien de verkeerde laag "
-"geselecteerd?"
+"<html>De geselecteerde gegevens bevatten gegevens van "
+"OpenStreetBugs.<br>Deze gegevens kan je niet uploaden. Heb je misschien de "
+"verkeerde laag geselecteerd?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -16547,5 +16598,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 "Kop bevat meerdere waarden en kan niet in een enkele string worden geplaatst"
@@ -16658,5 +16710,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
-msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgid ""
+"You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
 
@@ -16709,5 +16762,6 @@
 
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
-msgid "Write position information into the exif header of the following files:"
+msgid ""
+"Write position information into the exif header of the following files:"
 msgstr ""
 
@@ -17527,4 +17581,12 @@
 msgstr "Terras"
 
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr ""
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr ""
+
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
 msgid "Merge objects nodes"
@@ -17969,6 +18031,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
 msgid ""
-"Development of the turn restriction plugin was sponsored by <a href=\"http://"
-"www.skobbler.de\">skobbler GmbH</a>."
+"Development of the turn restriction plugin was sponsored by <a "
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
 
@@ -18054,8 +18116,8 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
-"a turn restriction, the way with role <tt>from</tt> should be different from "
-"the way with role <tt>to</tt>, though."
+"This turn restriction uses the OSM way <span class=\"object-"
+"name\">{0}</span> with role <tt>from</tt> <strong>and</strong> with role "
+"<tt>to</tt>. In a turn restriction, the way with role <tt>from</tt> should "
+"be different from the way with role <tt>to</tt>, though."
 msgstr ""
 
@@ -18109,8 +18171,8 @@
 "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
 "<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
-"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
-"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
-"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
-"object."
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-"
+"name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It is "
+"recommended to set <span class=\"object-name\">{2}</span> as unique "
+"<strong>via</strong>-object."
 msgstr ""
 
@@ -18222,6 +18284,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM node <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18229,6 +18291,6 @@
 #, java-format
 msgid ""
-"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+"This turn restriction uses the OSM relation <span class=\"object-"
+"name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18876,10 +18938,11 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
-msgstr ""
-"De bronnen (URL of bestandsnaam) van spellingscontrole (zie http://wiki."
-"openstreetmap.org/index.php/User:JLS/speller) of gegevensbestanden van "
-"tagchecker."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
+msgstr ""
+"De bronnen (URL of bestandsnaam) van spellingscontrole (zie "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) of "
+"gegevensbestanden van tagchecker."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
@@ -19025,5 +19088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -19127,5 +19190,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:142
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:100
 msgid "Shows current position in the video"
 msgstr ""
@@ -19505,9 +19568,6 @@
 msgstr ""
 
-#. *
-#. This file can be used to add some special messages to the translation,
-#. which are not part of the programm texts, but should be translated nevertheless.
-#.
-#: build/specialmessages.java:6
+#. OSM server message
+#: build/specialmessages.java:8
 msgid ""
 "You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -19518,10 +19578,10 @@
 
 #. OSM server message
-#: build/specialmessages.java:7
+#: build/specialmessages.java:9
 msgid "Database offline for maintenance"
 msgstr "Vanwege onderhoud is de database niet bereikbaar"
 
 #. OSM server message
-#: build/specialmessages.java:8
+#: build/specialmessages.java:10
 msgid ""
 "The maximum bbox size is 0.25, and your request was too large. Either "
@@ -19531,25 +19591,25 @@
 "groot. Kies een kleiner gebied of gebruik planet.osm"
 
-#. OSM server message
-#: build/specialmessages.java:9
+#. Java message loading audio data
+#: build/specialmessages.java:11
 msgid "could not get audio input stream from input URL"
 msgstr "Kan geen geluidsinvoerstroom uit invoer-URL krijgen"
 
 #. Java message loading audio data
-#: build/specialmessages.java:10
+#: build/specialmessages.java:12
 msgid "Audio Device Unavailable"
 msgstr ""
 
-#. Java message loading audio data
-#: build/specialmessages.java:11
+#. use has not made edits public
+#: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
 msgstr ""
 
-#. use has not made edits public
-#: build/specialmessages.java:12
+#. Nominatim search place type
+#: build/specialmessages.java:14
 msgid "town"
 msgstr ""
 
-#. Nominatim search place type
+#. Landuse type used in multipolygons
 #. color basin
 #. <icon src="misc/no_icon.png"/>
@@ -19557,17 +19617,17 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:13 build/trans_style.java:3228
+#: build/specialmessages.java:15 build/trans_style.java:3228
 msgid "forest"
 msgstr "bosbouw"
 
 #. Landuse type used in multipolygons
-#: build/specialmessages.java:14
+#: build/specialmessages.java:16
 msgid "farmland"
 msgstr ""
 
-#. Landuse type used in multipolygons
+#. relation type
 #. color route
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19575,7 +19635,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--boundary tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -19585,5 +19645,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="admin_level" v="1"/>
@@ -19626,5 +19686,5 @@
 #. color boundary
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -19634,5 +19694,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -19642,5 +19702,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -19650,8 +19710,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/specialmessages.java:15 build/trans_style.java:3622
+#: build/specialmessages.java:17 build/trans_style.java:3622
 #: build/trans_style.java:3630 build/trans_style.java:3634
 #: build/trans_style.java:3638 build/trans_style.java:3642
@@ -19665,5 +19725,5 @@
 
 #. relation type
-#: build/specialmessages.java:16
+#: build/specialmessages.java:18
 msgid "multipolygon"
 msgstr ""
@@ -19674,5 +19734,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -19681,7 +19741,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--route tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -19691,5 +19751,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -19699,5 +19759,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -19707,5 +19767,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -19715,5 +19775,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -19723,5 +19783,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -19731,5 +19791,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -19739,8 +19799,8 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/specialmessages.java:17 build/trans_style.java:3556
+#: build/specialmessages.java:19 build/trans_style.java:3556
 #: build/trans_style.java:3564 build/trans_style.java:3572
 #: build/trans_style.java:3580 build/trans_style.java:3588
@@ -19750,58 +19810,60 @@
 msgstr "route"
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:22
-#, fuzzy
 msgid "Attributes"
-msgstr "Optionele attributen:"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:23
-#, fuzzy
 msgid "Modified"
-msgstr "geen aanpastoets"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:25
-#, fuzzy
 msgid "File name:"
-msgstr "Echte naam"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:26
-#, fuzzy
 msgid "Size"
-msgstr "Overstap"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:28
 msgid "Files of type:"
 msgstr ""
 
+#. Strings in JFileChooser
 #: build/specialmessages.java:29
-#, fuzzy
 msgid "Home"
-msgstr "Startpagina"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:30
-#, fuzzy
 msgid "List"
-msgstr "Taoist"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:31
-#, fuzzy
 msgid "Look in:"
-msgstr "Inzoomen"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:32
-#, fuzzy
 msgid "New Folder"
-msgstr "Nieuwe rol"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:33
-#, fuzzy
 msgid "Create New Folder"
-msgstr "Nieuwe node maken."
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:35
-#, fuzzy
 msgid "Save in:"
-msgstr "Opslaan"
-
+msgstr ""
+
+#. Strings in JFileChooser
 #: build/specialmessages.java:37
 msgid "Up One Level"
@@ -19872,5 +19934,6 @@
 #. Plugin globalsat
 #: build/trans_plugins.java:23
-msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgid ""
+"Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
 
@@ -20036,6 +20099,13 @@
 msgstr ""
 
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:79
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr ""
+
 #. Plugin Tracer
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20044,5 +20114,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20051,10 +20121,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20063,5 +20133,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20071,5 +20141,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20078,15 +20148,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20095,5 +20165,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20983,7 +21053,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- junction tag -->
-#.
+#. 
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -21123,8 +21193,8 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#.
+#. 
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -21334,5 +21404,5 @@
 #. color motorroad
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -21342,5 +21412,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -21359,5 +21429,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -21367,5 +21437,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -21384,5 +21454,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -21392,5 +21462,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -21409,5 +21479,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -21417,5 +21487,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -21430,5 +21500,5 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -21446,5 +21516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -21462,5 +21532,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -21469,5 +21539,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--public_transport tags -->
 #. <rule>
@@ -21477,5 +21547,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -21495,5 +21565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -21502,5 +21572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -21510,5 +21580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -22212,5 +22282,5 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#.
+#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22261,5 +22331,5 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#.
+#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22356,5 +22426,5 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#.
+#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -22522,5 +22592,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -22854,5 +22924,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -22862,5 +22932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -22870,5 +22940,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -22878,5 +22948,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -22886,5 +22956,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -22894,5 +22964,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -22902,5 +22972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -22911,5 +22981,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="funicular"/>
@@ -24329,5 +24399,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -24337,5 +24407,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -24345,5 +24415,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -24353,5 +24423,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -24715,7 +24785,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--sport tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -24725,5 +24795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -24733,5 +24803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -24741,5 +24811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -24749,5 +24819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -24757,5 +24827,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -24765,5 +24835,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -24773,5 +24843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -24781,5 +24851,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -24789,5 +24859,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -24797,5 +24867,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -24805,5 +24875,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -24813,5 +24883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -24821,5 +24891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -24829,5 +24899,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -24837,5 +24907,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -24845,5 +24915,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -24853,5 +24923,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -24861,5 +24931,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -24869,5 +24939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -24877,5 +24947,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -24885,5 +24955,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -24893,5 +24963,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -24901,5 +24971,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -24909,5 +24979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -24917,5 +24987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -24925,5 +24995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -24933,5 +25003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -24941,5 +25011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -24949,5 +25019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -24957,5 +25027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -24965,5 +25035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -24973,5 +25043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -24981,5 +25051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -24989,5 +25059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -24997,5 +25067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -25005,5 +25075,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -25013,5 +25083,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -25021,5 +25091,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -25029,5 +25099,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -25037,5 +25107,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -25045,5 +25115,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -25053,5 +25123,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -25061,5 +25131,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -25069,5 +25139,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -25077,5 +25147,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -25085,5 +25155,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -26789,7 +26859,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--landuse tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -26799,5 +26869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -26807,5 +26877,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -26815,5 +26885,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -26823,5 +26893,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="orchard"/>
@@ -26831,5 +26901,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -26839,5 +26909,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -26847,5 +26917,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -26855,5 +26925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -28276,5 +28346,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -28290,5 +28360,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -28298,5 +28368,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
 #. <rule>
@@ -28307,5 +28377,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28318,7 +28388,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- cycleway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -28328,5 +28398,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_lane"/>
@@ -28336,5 +28406,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -28344,5 +28414,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -28352,5 +28422,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -28384,5 +28454,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -28398,5 +28468,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -28406,5 +28476,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28413,5 +28483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -28421,5 +28491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -28430,5 +28500,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -28453,5 +28523,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -28566,9 +28636,9 @@
 #. 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
@@ -28576,5 +28646,5 @@
 #. 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,
@@ -28584,8 +28654,8 @@
 #. 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
@@ -28599,5 +28669,5 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#.
+#. 
 #: build/trans_style.java:72
 msgid "standard"
@@ -28605,5 +28675,5 @@
 
 #. mappaint style named "standard"
-#.
+#. 
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -28652,6 +28722,6 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
 #. <rule>
@@ -28731,5 +28801,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -28739,11 +28809,11 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--abutters tags -->
-#.
+#. 
 #. <!--accessories tags -->
-#.
+#. 
 #. <!--properties tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -28759,5 +28829,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -28766,5 +28836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -28773,5 +28843,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -28787,5 +28857,5 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -28799,5 +28869,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -28806,5 +28876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -28813,5 +28883,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -28820,5 +28890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -28827,5 +28897,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -28834,5 +28904,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -28841,5 +28911,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxweight"/>
@@ -28848,5 +28918,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxheight"/>
@@ -28855,5 +28925,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -28862,5 +28932,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxlength"/>
@@ -28869,5 +28939,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -28876,5 +28946,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="minspeed"/>
@@ -28883,5 +28953,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="maxstay"/>
@@ -28890,5 +28960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="toll"/>
@@ -28897,5 +28967,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="barrier"/>
@@ -29072,7 +29142,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- highway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -29086,5 +29156,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -29094,7 +29164,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- tracktype tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -29104,5 +29174,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -29112,5 +29182,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -29120,5 +29190,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -29128,5 +29198,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -29142,5 +29212,5 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -29149,5 +29219,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -29157,5 +29227,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -29164,5 +29234,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -29171,5 +29241,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -29178,5 +29248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -29185,5 +29255,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -29192,5 +29262,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -29199,5 +29269,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -29206,5 +29276,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -29213,5 +29283,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -29220,5 +29290,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -29232,5 +29302,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -29244,5 +29314,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -29251,5 +29321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -29263,5 +29333,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -29276,5 +29346,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -29289,5 +29359,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -29301,5 +29371,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -29313,5 +29383,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -29320,5 +29390,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -29327,5 +29397,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -29335,5 +29405,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -29342,5 +29412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -29349,5 +29419,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -29356,5 +29426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -29364,5 +29434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -29373,5 +29443,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -29381,7 +29451,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--man_made tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -29391,5 +29461,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -29399,5 +29469,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -29407,5 +29477,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -29416,5 +29486,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="petroleum_well"/>
@@ -29423,5 +29493,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -29431,5 +29501,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -29439,5 +29509,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -29447,5 +29517,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -29455,5 +29525,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -29463,5 +29533,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -29471,5 +29541,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -29479,5 +29549,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -29487,5 +29557,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -29495,5 +29565,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="water_works"/>
@@ -29516,5 +29586,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="waterway" v="rapids"/>
@@ -29529,7 +29599,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- railway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -29539,5 +29609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -29546,5 +29616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -29554,5 +29624,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -29561,5 +29631,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -29569,5 +29639,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -29577,5 +29647,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -29591,5 +29661,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -29600,5 +29670,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -29617,5 +29687,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -29625,5 +29695,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29636,5 +29706,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -29653,5 +29723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -29660,5 +29730,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -29667,5 +29737,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -29674,7 +29744,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aeroway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -29685,5 +29755,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -29698,5 +29768,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -29710,5 +29780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -29718,5 +29788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -29730,5 +29800,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -29742,5 +29812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="gate"/>
@@ -29749,5 +29819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -29756,7 +29826,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--aerialway tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -29766,5 +29836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -29774,5 +29844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -29782,5 +29852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -29790,5 +29860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -29798,5 +29868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
@@ -29812,7 +29882,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- piste tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -29827,5 +29897,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -29840,5 +29910,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -29853,5 +29923,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -29866,5 +29936,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -29879,5 +29949,5 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -29892,7 +29962,7 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--power tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -29902,5 +29972,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -29909,5 +29979,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -29917,5 +29987,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -29925,5 +29995,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -29933,5 +30003,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -29941,5 +30011,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -29949,5 +30019,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -29957,5 +30027,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -29965,5 +30035,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -29973,5 +30043,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -29981,5 +30051,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -29989,5 +30059,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -29997,5 +30067,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -30015,5 +30085,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -30028,5 +30098,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -30039,7 +30109,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--leisure tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -30049,5 +30119,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -30057,5 +30127,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -30065,5 +30135,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -30073,5 +30143,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -30081,5 +30151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -30089,5 +30159,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -30097,5 +30167,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -30105,5 +30175,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -30113,5 +30183,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -30121,5 +30191,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -30129,5 +30199,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -30137,5 +30207,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -30145,5 +30215,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -30153,5 +30223,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -30161,5 +30231,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="dog_park"/>
@@ -30169,5 +30239,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="ice_rink"/>
@@ -30189,5 +30259,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -30201,7 +30271,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--amenity tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -30211,5 +30281,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -30219,5 +30289,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -30227,5 +30297,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="stripclub"/>
@@ -30235,5 +30305,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="brothel"/>
@@ -30243,5 +30313,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -30251,5 +30321,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -30259,5 +30329,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="food_court"/>
@@ -30267,5 +30337,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -30275,5 +30345,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -30283,5 +30353,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -30300,5 +30370,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -30308,5 +30378,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -30316,5 +30386,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -30324,5 +30394,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -30332,5 +30402,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -30340,5 +30410,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -30348,5 +30418,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -30356,5 +30426,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -30364,5 +30434,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -30372,5 +30442,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -30380,5 +30450,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -30388,5 +30458,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -30405,5 +30475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grit_bin"/>
@@ -30412,5 +30482,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -30420,5 +30490,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -30427,5 +30497,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -30435,5 +30505,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -30443,5 +30513,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -30451,5 +30521,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -30458,5 +30528,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -30466,5 +30536,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -30474,5 +30544,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -30482,5 +30552,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -30490,5 +30560,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -30497,5 +30567,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -30504,5 +30574,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -30511,5 +30581,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -30518,5 +30588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -30525,5 +30595,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -30532,5 +30602,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -30539,5 +30609,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -30546,5 +30616,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -30553,5 +30623,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -30560,5 +30630,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -30567,5 +30637,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -30574,5 +30644,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -30581,5 +30651,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -30589,5 +30659,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -30597,5 +30667,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -30605,5 +30675,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -30613,5 +30683,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -30621,5 +30691,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -30629,5 +30699,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -30637,5 +30707,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -30645,5 +30715,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -30653,5 +30723,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -30662,5 +30732,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -30670,5 +30740,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -30678,5 +30748,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -30686,5 +30756,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -30694,5 +30764,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -30702,5 +30772,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -30710,5 +30780,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -30718,5 +30788,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -30726,5 +30796,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -30734,5 +30804,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -30742,5 +30812,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -30750,5 +30820,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -30758,5 +30828,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -30766,5 +30836,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -30774,5 +30844,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -30782,5 +30852,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -30790,5 +30860,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -30798,5 +30868,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="marketplace"/>
@@ -30806,5 +30876,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -30814,5 +30884,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -30821,5 +30891,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -30851,5 +30921,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -30859,5 +30929,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -30867,7 +30937,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--natural tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -30882,5 +30952,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -30890,5 +30960,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -30898,5 +30968,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -30906,5 +30976,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -30914,5 +30984,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -30922,5 +30992,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -30930,5 +31000,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -30944,7 +31014,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--shop tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -30954,5 +31024,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -30962,5 +31032,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -30970,5 +31040,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -30978,5 +31048,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -30986,5 +31056,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -30994,5 +31064,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -31002,5 +31072,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -31010,5 +31080,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -31018,5 +31088,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -31026,5 +31096,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -31034,5 +31104,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -31042,5 +31112,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -31050,5 +31120,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -31058,5 +31128,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -31066,5 +31136,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -31074,5 +31144,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -31082,5 +31152,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -31090,5 +31160,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -31098,5 +31168,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -31106,5 +31176,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -31114,5 +31184,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -31122,5 +31192,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -31130,5 +31200,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -31138,5 +31208,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -31146,5 +31216,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -31154,5 +31224,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -31162,5 +31232,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -31170,5 +31240,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -31178,5 +31248,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -31186,5 +31256,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -31194,5 +31264,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -31202,5 +31272,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -31210,5 +31280,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -31218,5 +31288,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -31226,5 +31296,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -31234,5 +31304,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -31242,5 +31312,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -31250,5 +31320,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -31258,5 +31328,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -31266,5 +31336,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -31274,5 +31344,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -31282,5 +31352,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -31316,7 +31386,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--tourism tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -31326,5 +31396,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -31334,5 +31404,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -31342,5 +31412,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -31350,5 +31420,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -31358,5 +31428,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -31366,5 +31436,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -31374,5 +31444,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -31389,5 +31459,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -31397,5 +31467,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -31405,5 +31475,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -31413,5 +31483,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -31421,5 +31491,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -31429,5 +31499,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -31438,5 +31508,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -31446,5 +31516,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- information tags -->
 #. <rule>
@@ -31454,5 +31524,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -31462,5 +31532,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -31469,5 +31539,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -31476,5 +31546,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -31492,7 +31562,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--historic tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -31502,5 +31572,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -31510,5 +31580,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -31518,5 +31588,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -31526,5 +31596,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -31534,5 +31604,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -31542,5 +31612,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -31550,5 +31620,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -31558,5 +31628,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -31566,5 +31636,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -31582,5 +31652,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -31594,5 +31664,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -31606,5 +31676,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -31614,5 +31684,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -31626,5 +31696,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -31638,6 +31708,6 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
-#.
+#. 
+#. 
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -31647,5 +31717,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -31659,5 +31729,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -31671,5 +31741,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -31683,5 +31753,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -31695,5 +31765,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -31707,5 +31777,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -31715,7 +31785,7 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!--military tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -31725,5 +31795,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -31733,5 +31803,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -31741,5 +31811,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -31749,5 +31819,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -31764,5 +31834,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -31775,5 +31845,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -31787,5 +31857,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -31799,5 +31869,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -31811,5 +31881,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -31820,5 +31890,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -31828,5 +31898,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -31836,5 +31906,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -31844,5 +31914,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -31852,5 +31922,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -31867,5 +31937,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -31879,5 +31949,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -31891,5 +31961,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -31903,5 +31973,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -31915,5 +31985,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -31928,5 +31998,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
 #. XXX - maybe it's possible to use linemod's here?
@@ -31952,5 +32022,5 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -31961,11 +32031,11 @@
 #. </rule>
 #. -->
-#.
+#. 
 #. <!--name tags -->
-#.
+#. 
 #. <!--preferences tags -->
-#.
+#. 
 #. <!--place tags -->
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -31975,5 +32045,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -31983,5 +32053,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -31991,5 +32061,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -31999,5 +32069,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -32007,5 +32077,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -32015,5 +32085,5 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -32023,5 +32093,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -32031,5 +32101,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -32039,5 +32109,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -32047,5 +32117,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -32055,5 +32125,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -32063,5 +32133,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -32081,5 +32151,5 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#.
+#. 
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -32174,5 +32244,5 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#.
+#. 
 #. Data type can be:
 #. node        - a node point
@@ -32180,28 +32250,28 @@
 #. relation    - a relation
 #. *           - all data types
-#.
+#. 
 #. Message type can be:
 #. E            - an error
 #. W            - a warning
 #. I            - an low priority informational warning
-#.
+#. 
 #. Key and value are expressions describing certain keys and values of these keys.
 #. Regulator expressions are supported. In this case the expressions starts and
 #. ends with // signs. If an 'i' is appended, the regular expression is
 #. case insensitive.
-#.
+#. 
 #. The * sign indicates any string.
 #. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
 #. handling for boolean values (yes, true, 0, false, no, ...).
-#.
+#. 
 #. Expression can be:
 #. !=          - the key/value combination does not match
 #. ==          - the key/value combination does match
-#.
+#. 
 #. To have more complicated expressions, multiple elements can be grouped together
 #. with an logical and (&&).
-#.
+#. 
 #. The comment at the end of a rule is displayed in validator description
-#.
+#. 
 #. Empty lines and space signs are ignored
 #: build/trans_validator.java:38
@@ -32316,5 +32386,5 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#.
+#. 
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -32327,5 +32397,5 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#.
+#. 
 #. different forms for web access
 #. must be html:<url>
@@ -32350,6 +32420,6 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#.
-#.
+#. 
+#. 
 #. only for Germany
 #: build/trans_wms.java:17
@@ -32358,6 +32428,6 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#.
-#.
+#. 
+#. 
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -32372,6 +32442,6 @@
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
-#.
-#.
+#. 
+#. 
 #. only for Czech Republic
 #: build/trans_wms.java:27
@@ -32385,6 +32455,6 @@
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
-#.
-#.
+#. 
+#. 
 #. only for GB
 #. fails with division by zero error
@@ -32404,6 +32474,6 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#.
-#.
+#. 
+#. 
 #. only for Japan
 #: build/trans_wms.java:39
@@ -32427,6 +32497,6 @@
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
-#.
-#.
+#. 
+#. 
 #. only for Italy
 #: build/trans_wms.java:46
@@ -32471,4 +32541,5 @@
 #~ msgstr "Conflicten oplossen"
 
+#, java-format
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
@@ -32477,4 +32548,5 @@
 #~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
 
+#, java-format
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Geen tijd voor punt {0} x {1}"
@@ -32498,4 +32570,5 @@
 #~ msgstr "Openen in browser"
 
+#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Maak een melding bij {0}"
@@ -32503,13 +32576,12 @@
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr ""
-#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies "
-#~ "mogelijk)!"
+#~ "Beschrijf de gevolgde stappen die tot de fout leidde (zo precies mogelijk)!"
 
 #~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
+#~ "Try updating to the newest version of JOSM and all plugins before reporting "
+#~ "a bug."
 #~ msgstr ""
-#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins "
-#~ "voordat je de fout meldt."
+#~ "Probeer te updaten naar de nieuwste versie van JOSM en alle plugins voordat "
+#~ "je de fout meldt."
 
 #~ msgid "Be sure to include the following information:"
@@ -32520,6 +32592,6 @@
 #~ "some time."
 #~ msgstr ""
-#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het "
-#~ "later nog eens."
+#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het later "
+#~ "nog eens."
 
 #~ msgid "Error during parse."
@@ -32553,7 +32625,9 @@
 #~ msgstr "Uploaden..."
 
+#, java-format
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin niet gevonden: {0}"
 
+#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin vereist JOSM-update: {0}"
@@ -32563,12 +32637,11 @@
 #~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "(Je kunt het aantal dagen waarna deze waarschuwing "
-#~ "verschijnt<br>instellen via de configuratieoptie 'pluginmanager."
-#~ "warntime'.)"
+#~ "(Je kunt het aantal dagen waarna deze waarschuwing verschijnt<br>instellen "
+#~ "via de configuratieoptie 'pluginmanager.warntime'.)"
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
-#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe "
-#~ "gegevens naar de server."
+#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe gegevens "
+#~ "naar de server."
 
 #~ msgid "Unsaved Changes"
@@ -32609,6 +32682,6 @@
 
 #~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
+#~ "Revert the state of all currently selected objects to the version selected "
+#~ "in the history list."
 #~ msgstr ""
 #~ "De staat van alle geselecteerde objecten terugdraaien naar de versie "
@@ -32624,4 +32697,5 @@
 #~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
 
+#, java-format
 #~ msgid "Images for {0}"
 #~ msgstr "Afbeeldingen van {0}"
@@ -32670,6 +32744,5 @@
 
 #~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
+#~ "Parameters are read in the order they are specified, so make sure you load\n"
 #~ "some data before --selection"
 #~ msgstr ""
@@ -32680,4 +32753,5 @@
 #~ msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
 
+#, java-format
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32689,4 +32763,5 @@
 #~ "{0}"
 
+#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kan plugin niet downloaden: {0} van {1}"
@@ -32704,4 +32779,5 @@
 #~ msgstr "EPSG:4326"
 
+#, java-format
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Ontleedfout in URL: \"{0}\""
@@ -32714,6 +32790,6 @@
 
 #~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ "Internal Error: cannot check conditions for no layer. Please report this as "
+#~ "a bug."
 #~ msgstr ""
 #~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer "
@@ -32721,9 +32797,9 @@
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "The selected nodes have differing relation memberships.  Do you still want "
+#~ "to merge them?"
 #~ msgstr ""
-#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze "
-#~ "toch samenvoegen?"
+#~ "De geselecteerde knopen behoren tot verschillende relaties. Wil je ze toch "
+#~ "samenvoegen?"
 
 #~ msgid "Merge nodes with different memberships?"
@@ -32736,10 +32812,11 @@
 #~ msgstr "Slechts één knoop geselecteerd"
 
+#, java-format
 #~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
+#~ "The plugin {0} seems to be broken or could not be downloaded automatically."
 #~ msgstr ""
 #~ "De plugin {0} lijkt beschadigd of kan niet automatisch worden gedownload."
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32758,4 +32835,5 @@
 #~ msgstr "Naar OSM uploaden..."
 
+#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -32764,6 +32842,6 @@
 #~ "{0}"
 #~ msgstr ""
-#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden "
-#~ "door de bestaande te verwijderen?\n"
+#~ "Plugin-archief is al beschikbaar. Wil je de huidige versie downloaden door "
+#~ "de bestaande te verwijderen?\n"
 #~ "\n"
 #~ "{0}"
@@ -32772,19 +32850,25 @@
 #~ msgstr "Relatie bevat leeg lid."
 
+#, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
+#, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
+#, java-format
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Weg \"{0}\" met minder dan twee punten."
 
+#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
+#, java-format
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Binnenweg \"{0}\" is uitwendig."
 
+#, java-format
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "Niet-weg \"{0}\" in multipolygoon."
@@ -32805,4 +32889,5 @@
 #~ msgstr "update aanvragen is mislukt"
 
+#, java-format
 #~ msgid "{0} within the track."
 #~ msgstr "{0} binnen de track."
@@ -32817,4 +32902,5 @@
 #~ msgstr "Afbeeldings-id Metacarta Map Rectifier"
 
+#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier-id={0}"
@@ -32825,6 +32911,6 @@
 
 #~ msgid ""
-#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab "
-#~ "- these will then show up in the WMS menu.\n"
+#~ "You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
+#~ "these will then show up in the WMS menu.\n"
 #~ "\n"
 #~ "You can also do this manually in the Advanced Preferences, using the "
@@ -32841,6 +32927,6 @@
 #~ "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
 #~ "only need to input the relevant 'id'.\n"
-#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like "
-#~ "in this example,replacing 73 with your image id: \n"
+#~ "To add a Metacarta Map Rectifier menu item, manually create the URL like in "
+#~ "this example,replacing 73 with your image id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
@@ -32849,9 +32935,9 @@
 #~ "use."
 #~ msgstr ""
-#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, "
-#~ "bewerken en wissen - deze zullen in het WMS-menu getoond worden.\n"
+#~ "Je kunt WMS-invoer in het tabblad WMSplugin-voorkeuren toevoegen, bewerken "
+#~ "en wissen - deze zullen in het WMS-menu getoond worden.\n"
 #~ "\n"
-#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, "
-#~ "gebruikmakend van het volgende schema:\n"
+#~ "Je kunt dit ook handmatig doen in de Uitgebreide voorkeuren, gebruikmakend "
+#~ "van het volgende schema:\n"
 #~ "wmsplugin.url.1.name=Landsat\n"
 #~ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
@@ -32865,13 +32951,14 @@
 #~ "Voor de Metacarta's Map Rectifier (http://labs.metacarta.com/rectifier/) "
 #~ "moet je de betreffende 'id' invoeren.\n"
-#~ "Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een "
-#~ "URL volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je "
-#~ "eigen afbeeldings-id: \n"
+#~ "Om een  menuitem van Metacarta Map Rectifier toe te voegen, maak je een URL "
+#~ "volgens het volgende voorbeeld, waarbij 73 vervangen wordt door je eigen "
+#~ "afbeeldings-id: \n"
 #~ "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
 #~ "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
 #~ " \n"
-#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij "
-#~ "twijfel: niet gebruiken."
-
+#~ "Merk op: Weet zeker dat de afbeelding vrij is van copyrights. Bij twijfel: "
+#~ "niet gebruiken."
+
+#, java-format
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Kan niet lezen van URL: \"{0}\""
@@ -32908,6 +32995,5 @@
 #~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "<html>Ik kan een foto van mijn GPS-ontvanger maken.<br>Zou dat helpen?</"
-#~ "html>"
+#~ "<html>Ik kan een foto van mijn GPS-ontvanger maken.<br>Zou dat helpen?</html>"
 
 #~ msgid "All images"
@@ -32948,7 +33034,9 @@
 #~ "Opent het OpenStreetBugs-scherm en activeert de automatische download"
 
+#, java-format
 #~ msgid "Authors: {0}"
 #~ msgstr "Auteurs: {0}"
 
+#, java-format
 #~ msgid "Layers: {0}"
 #~ msgstr "Lagen: {0}"
@@ -32961,7 +33049,6 @@
 #~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 #~ msgstr ""
-#~ "De bronnen (URL of bestandsnaam) van bestanden met "
-#~ "tagvoorkeuzedefinities. Zie http://josm.openstreetmap.de/wiki/"
-#~ "TaggingPresets voor hulp."
+#~ "De bronnen (URL of bestandsnaam) van bestanden met tagvoorkeuzedefinities. "
+#~ "Zie http://josm.openstreetmap.de/wiki/TaggingPresets voor hulp."
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -32971,4 +33058,5 @@
 #~ msgstr "Bronnen tagvoorkeuzen"
 
+#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan voorkeurenmap niet openen: {0}"
@@ -33029,4 +33117,5 @@
 #~ "over dit probleem."
 
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
@@ -33035,22 +33124,23 @@
 #~ msgstr "onwaar"
 
+#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Los {0} conflicten in {1} objecten op"
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
+#~ "You are about to delete nodes outside of the area you have "
+#~ "downloaded.<br>This can cause problems because other objects (that you don't "
+#~ "see) might use them.<br>Do you really want to delete?"
 #~ msgstr ""
 #~ "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
-#~ "gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die "
-#~ "je niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
+#~ "gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die je "
+#~ "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
 #~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
+#~ "The selected ways have differing relation memberships.  Do you still want to "
+#~ "combine them?"
 #~ msgstr ""
-#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. "
-#~ "Weet u zeker dat u ze wilt combineren?"
+#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. Weet "
+#~ "u zeker dat u ze wilt combineren?"
 
 #~ msgid "Combine ways with different memberships?"
@@ -33069,4 +33159,5 @@
 #~ msgstr "E-mail"
 
+#, java-format
 #~ msgid "Contact {0}..."
 #~ msgstr "Verbinden met {0}..."
@@ -33084,10 +33175,13 @@
 #~ msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken"
 
+#, java-format
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fout tijdens het laden van {0}"
 
+#, java-format
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
 
+#, java-format
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Voorkeuze ''{0}'' gebruiken"
@@ -33100,16 +33194,19 @@
 
 #~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
+#~ "Activating the updated plugins failed. Check if JOSM has the permission to "
+#~ "overwrite the existing ones."
 #~ msgstr ""
 #~ "Het activeren van de bijgewerkte plugins is mislukt. Controleer of JOSM "
 #~ "rechten heeft om de bestaande plugins te overschrijven."
 
+#, java-format
 #~ msgid "GPS start: {0}"
 #~ msgstr "GPS-start: {0}"
 
+#, java-format
 #~ msgid "GPS end: {0}"
 #~ msgstr "GPS-einde: {0}"
 
+#, java-format
 #~ msgid "current delta: {0}s"
 #~ msgstr "Huidige verschil: {0}s"
@@ -33118,9 +33215,14 @@
 #~ msgstr "Klok synchroniseren"
 
+#, java-format
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
 
+#, java-format
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken."
 
 #~ msgid ""
@@ -33129,7 +33231,9 @@
 #~ "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
 
+#, java-format
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Opdrachtenlijst: {0}"
 
+#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33152,9 +33256,8 @@
 #~ msgstr "Hulp / Over"
 
-#~ msgid ""
-#~ "The selection contains {0} way. Are you sure you want to simplify it?"
+#, java-format
+#~ msgid "The selection contains {0} way. Are you sure you want to simplify it?"
 #~ msgid_plural ""
-#~ "The selection contains {0} ways. Are you sure you want to simplify them "
-#~ "all?"
+#~ "The selection contains {0} ways. Are you sure you want to simplify them all?"
 #~ msgstr[0] ""
 #~ "De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?"
@@ -33196,4 +33299,5 @@
 #~ msgstr "fietskaart"
 
+#, java-format
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n"
@@ -33257,17 +33361,19 @@
 
 #~ msgid ""
-#~ "A special handler of the french cadastre wms at www.cadastre.gouv."
-#~ "fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-#~ "<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-#~ "CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/"
-#~ "html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data "
-#~ "created by this plugin."
+#~ "A special handler of the french cadastre wms at "
+#~ "www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+#~ "(in french): <br><a "
+#~ "href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+#~ "l\"> "
+#~ "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+#~ "<BR>before any upload of data created by this plugin."
 #~ msgstr ""
-#~ "Een speciale bewerker van de Franse kadaster WMS op www.cadastre.gouv."
-#~ "fr<BR><BR>Lees de gebruiksvoorwaarden (in het Frans): <br><a href="
-#~ "\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html"
-#~ "\"> http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr."
-#~ "html</a> <BR>voor het uploaden van gegevens die met deze plugin zijn "
-#~ "gemaakt."
+#~ "Een speciale bewerker van de Franse kadaster WMS op "
+#~ "www.cadastre.gouv.fr<BR><BR>Lees de gebruiksvoorwaarden (in het Frans): "
+#~ "<br><a "
+#~ "href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+#~ "l\"> "
+#~ "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+#~ "<BR>voor het uploaden van gegevens die met deze plugin zijn gemaakt."
 
 #~ msgid "sports"
@@ -33283,4 +33389,5 @@
 #~ msgstr "Omlaag bewegen"
 
+#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relatie-editor: {0}"
@@ -33305,14 +33412,15 @@
 #~ msgstr "Toch samenvoegen"
 
+#, java-format
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
 #~ "continue?"
 #~ msgstr ""
-#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch "
-#~ "doorgaan?"
+#~ "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?"
 
 #~ msgid "Update Data"
 #~ msgstr "Gegevens bijwerken"
 
+#, java-format
 #~ msgid "Change the projection to {0} first."
 #~ msgstr "Verander eerste de projectie in {0}."
@@ -33331,4 +33439,5 @@
 #~ "DIT IS EXPERIMENTEEL. Sla je werk op en controleer het vóór uploaden."
 
+#, java-format
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}"
@@ -33338,6 +33447,6 @@
 
 #~ msgid ""
-#~ "An error occured while trying to match the photos to the GPX track. You "
-#~ "can adjust the sliders to manually match the photos."
+#~ "An error occured while trying to match the photos to the GPX track. You can "
+#~ "adjust the sliders to manually match the photos."
 #~ msgstr ""
 #~ "Het koppelen van de foto's aan de GPX-track is mislukt. Je kunt de "
@@ -33345,9 +33454,11 @@
 
 #~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
+#~ "No data to update found. Have you already opened or downloaded a data layer?"
 #~ msgstr ""
-#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend "
-#~ "of gedownload?"
+#~ "Geen gegevens gevonden om te updaten. Heeft u al een gegevenslaag geopend of "
+#~ "gedownload?"
+
+#~ msgid "Errors during Download"
+#~ msgstr "Fouten tijdens download"
 
 #~ msgid "Edit Track of grade 1"
@@ -33378,4 +33489,5 @@
 #~ msgstr "Valhek bewerken"
 
+#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -33399,10 +33511,11 @@
 #~ msgstr ">"
 
+#, java-format
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
 #~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum "
-#~ "is {1}"
+#~ "Het aantal wijzigingen overschrijdt het maximum, huidig is {0}, maximum is "
+#~ "{1}"
 
 #~ msgid "Conflicts in data"
@@ -33418,7 +33531,9 @@
 #~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
 
+#, java-format
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kan \"{0}\" niet lezen"
@@ -33427,14 +33542,16 @@
 #~ msgstr "Update selectie"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 #~ "resolve them first.</html>"
 #~ msgstr ""
-#~ "<html>Er zijn onopgeloste conflicten in laag ''{0}''.<br>U dient deze "
-#~ "eerst op te lossen</html>"
+#~ "<html>Er zijn onopgeloste conflicten in laag ''{0}''.<br>U dient deze eerst "
+#~ "op te lossen</html>"
 
 #~ msgid "Upload to OSM API failed"
 #~ msgstr "Upload naar OSM API gefaald"
 
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parameter ''{0}'' mag niet null zijn"
@@ -33449,7 +33566,9 @@
 #~ msgstr "Error tijdens het communiceren met de server."
 
+#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Id > 0 benodigd, kreeg {0}"
 
+#, java-format
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
@@ -33458,4 +33577,5 @@
 #~ msgstr "Aanpassen primitief"
 
+#, java-format
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Versturen van {0} objecten ..."
@@ -33464,24 +33584,26 @@
 #~ msgstr "Verwijderde of verplaatste primitieven"
 
+#, java-format
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
 #~ "deleted on the server. If you later try to delete or<br>update them the "
-#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</"
-#~ "strong> to check the state of these primitives<br>on the server.<br>Click "
+#~ "server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+#~ "to check the state of these primitives<br>on the server.<br>Click "
 #~ "<strong>{2}</strong> to ignore.<br></html>"
 #~ msgstr ""
-#~ "<html>Er zijn {0} primitieven in uw lokale dataset die<br>verwijderd "
-#~ "zouden kunnen zijn op de server. Indien u deze later probeert te "
-#~ "verwijderen of wijzigen<br>zal de server waarschijnlijk een <br>conflikt "
+#~ "<html>Er zijn {0} primitieven in uw lokale dataset die<br>verwijderd zouden "
+#~ "kunnen zijn op de server. Indien u deze later probeert te verwijderen of "
+#~ "wijzigen<br>zal de server waarschijnlijk een <br>conflikt "
 #~ "rapporteren.<br><br>Klik <strong>{1}</strong> om de staat van deze "
-#~ "primitieven<br>op de server te controleren.<br>Klik <strong>{2}</strong> "
-#~ "om te negeren.<br></html>"
+#~ "primitieven<br>op de server te controleren.<br>Klik <strong>{2}</strong> om "
+#~ "te negeren.<br></html>"
 
 #~ msgid "Wrong number of parameters for tags operator."
 #~ msgstr "Verkeerd aantal parameters voor tags operator"
 
+#, java-format
 #~ msgid ""
-#~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
-#~ "tags or range, for example tags:1 or tags:2-5"
+#~ "Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+#~ "or range, for example tags:1 or tags:2-5"
 #~ msgstr ""
 #~ "Onjuist aantal waardes voor tags operator: {0}. Tags operator verwacht "
@@ -33491,7 +33613,9 @@
 #~ msgstr "Onjuit aantal parameters voor knooppunten operator"
 
+#, java-format
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Onjuiste waarde van id operator: {0}. Verwachtte nummer"
 
+#, java-format
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -33501,4 +33625,9 @@
 #~ "verwacht aantal knooppunten, of bereik, bijvoorbeeld knooppunten:10-20"
 
+#, java-format
+#~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+#~ msgstr "Patroon syntax fout: Patroon {0} in {1} is illegaal!"
+
+#, java-format
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
