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

Timestamp:

2009-12-06T15:06:38+01:00 (15 years ago)

Author:

stoecker

Message:

updated

File:

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

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

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 16:20+0100\n"
-"PO-Revision-Date: 2009-11-29 14:31+0000\n"
+"POT-Creation-Date: 2009-12-06 14:57+0100\n"
+"PO-Revision-Date: 2009-11-29 22:18+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-29 21:04+0000\n"
+"X-Launchpad-Export-Date: 2009-12-06 13:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -29 +29 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:298
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -45 +45 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
@@ -61 +61 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
@@ -86 +85 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:150
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:66
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141
 msgid "Warning"
@@ -116 +115 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -137 +136 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -155 +154 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:343
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:49
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:241
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:149
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -187 +182 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:434
 msgid "Error"
 msgstr "Fout"
@@ -267 +262 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:269
 msgid "Plugins"
 msgstr "Plugins"
@@ -312 +307 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
@@ -317 +314 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -328 +325 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179
@@ -380 +375 @@
 #, java-format
 msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
-"to.</html>"
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
 msgstr ""
 
@@ -431 +426 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82
 msgid "Latitude"
 msgstr "Breedtegraad"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85
 msgid "Longitude"
 msgstr "Lengtegraad"
@@ -464 +459 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -498 +493 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
@@ -519 +517 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 #: ../plugins/terracer/src/terracer/TerracerAction.java:72
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
@@ -537 +532 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
@@ -549 +544 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:337
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:371
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:661
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:87
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -641 +636 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 #, java-format
 msgid "File: {0}"
@@ -694 +689 @@
 "reeks van knopen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:220
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
 msgid "Please select at least two ways to combine."
 msgstr "Selecteer twee of meer wegen om te combineren."
@@ -716 +711 @@
 msgstr "Selecteer iets om te kopiëren"
 
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
 msgid "Create Circle"
 msgstr "Cirkel aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 msgid "Create a circle from three selected nodes."
 msgstr "Een cirkel uit drie knopen maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -741 +736 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:380
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
@@ -815 +810 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:236
 #: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:73
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:89
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:218
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:71
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:87
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:216
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
@@ -837 +836 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
@@ -865 +864 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333
 msgid "Duplicate"
 msgstr "Dupliceren"
@@ -920 +919 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:174
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266
@@ -929 +926 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
@@ -940 +937 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:112
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
@@ -960 +957 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:123
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76
@@ -984 +981 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
@@ -1030 +1028 @@
 msgstr "Toon objectinformatie over OSM wegen, knopen of relaties."
 
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+msgid "Join overlapping Areas"
+msgstr "Overlappende gebieden samenvoegen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+msgid "Joins areas that overlap each other"
+msgstr "Overlappende gebieden samenvoegen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130
+msgid "Only up to two areas can be joined at the moment."
+msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135
+#, java-format
+msgid "\"{0}\" is not closed and therefore can't be joined."
+msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
+msgid ""
+"The selected way(s) have nodes outside of the downloaded data region.\n"
+"This can lead to nodes being deleted accidentally.\n"
+"Are you really sure to continue?"
+msgstr ""
+"Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
+"gegevensgebied.\n"
+"Hierdoor kunnen knopen onbedoeld gewist worden.\n"
+"Weet je zeker dat je verder wilt gaan?"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
+msgid "Please abort if you are not sure"
+msgstr "Breek af als je het niet zeker weet"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+msgid "Please select at least one closed way the should be joined."
+msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180
+msgid "No intersection found. Nothing was changed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+msgid "Added node on all intersections"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229
+msgid "Delete Ways that are not part of an inner multipolygon"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234
+msgid "Fix relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239
+msgid "Joined self-overlapping area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
+msgid "Joined overlapping areas"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244
+msgid ""
+"Some of the ways were part of relations that have been modified. Please "
+"verify no errors have been introduced."
+msgstr ""
+"Enkele wegen vormden onderdeel van relaties die zijn aangepast. Controleer "
+"of er geen fouten zijn geïntroduceerd."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+msgid "Enter values for all conflicts."
+msgstr "Waarden voor alle conflicten invoeren."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+msgid "Solve Conflicts"
+msgstr "Conflicten oplossen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322
+msgid "Fix tag conflicts"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483
+msgid "Removed Element from Relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607
+msgid "Join Areas: Remove Short Ways"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623
+msgid "Closed Way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911
+msgid "Remove tags from inner ways"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943
+msgid "Join Areas Function"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
@@ -1047 +1147 @@
 msgstr "Geen sneltoets"
 
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Jump To Position"
+msgstr "Naar positie springen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Opens a dialog that allows to jump to a specific location"
+msgstr ""
+"Een dialoogvenster openen waarmee naar een bepaalde locatie kan worden "
+"gesprongen."
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
+msgid "Enter Lat/Lon to jump to position."
+msgstr "Lat/lon invoeren om naar toe te springen."
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
+msgid "You can also paste an URL from www.openstreetmap.org"
+msgstr "Je kunt ook een URL van www.openstreetmap.org inplakken."
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
+msgid "Zoom (in metres)"
+msgstr "Zoom (in metres)"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
+msgid "Jump there"
+msgstr "Spring daarheen"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104
+msgid "Jump to Position"
+msgstr "Spring naar positie"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Could not parse Latitude, Longitude or Zoom. Please check."
+msgstr ""
+"Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p."
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Unable to parse Lon/Lat"
+msgstr "Kan lat/lon niet ontleden."
+
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
@@ -1055 +1199 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Knopen samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:46
 msgid "Merge nodes into the oldest one."
 msgstr "Knopen in de oudste samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:59
 msgid "Please select at least two nodes to merge."
 msgstr "Minstens twee knopen selecteren om samen te voegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:126
 msgid "Abort Merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:128
 msgid "Click to abort merging nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:135
 #, java-format
 msgid ""
@@ -1082 +1226 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:231
 #, java-format
 msgid "Merge {0} nodes"
@@ -1455 +1599 @@
 
 #: ../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"
@@ -1475 +1618 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
 msgid "Close"
 msgstr "Sluiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
+msgid "Simplify Way"
+msgstr "Weg vereenvoudigen"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
+msgid "Delete unnecessary nodes from a way."
+msgstr "Ongebruikte knopen van een weg verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:83
+msgid "Please select at least one way to simplify."
+msgstr "Selecteer minimaal één weg om te vereenvoudigen."
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87
+#, 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?"
+msgstr[0] ""
+"De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?"
+msgstr[1] ""
+"De selectie bevat {0} wegen. Weet je zeker dat je ze allemaal wilt "
+"vereenvoudigen?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:90
+msgid "Are you sure?"
+msgstr "Weet je het zeker?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67
+#, java-format
+msgid "Simplify Way (remove {0} node)"
+msgid_plural "Simplify Way (remove {0} nodes)"
+msgstr[0] "Vereenvoudig weg (verwijder {0} knoop)"
+msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73
@@ -1549 +1727 @@
 "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:383
@@ -1609 +1787 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-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"
@@ -1693 +1870 @@
 
 #. bounds defined? => use the bbox downloader
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Update selectie"
 
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
+msgid "There are no selected objects to update."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
-msgid "There are no selected objects to update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128
 msgid "Selection empty"
 msgstr "Selectie leeg"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153
 msgid "Update objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
 msgstr "Upload data"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1751 +1928 @@
 "op te lossen</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125
 msgid "No changes to upload."
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 msgid "Nothing to upload. Get some data first."
 msgstr "Niets om te uploaden. Creëer eerst gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Synchroniseer alleen relatie {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
 msgid "Synchronize entire dataset"
 msgstr "Synchroniseer alle gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256
 #, java-format
 msgid ""
@@ -1787 +1964 @@
 "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>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+"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 ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
 msgid "Conflicts detected"
 msgstr "Conflicten gedetecteerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304
 #, java-format
 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>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+"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 ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332
 #, java-format
 msgid ""
@@ -1818 +1993 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1844 +2019 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525
 msgid "Updating primitive"
 msgstr ""
@@ -1864 +2039 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
 #, java-format
 msgid ""
@@ -1872 +2047 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630
 #, java-format
 msgid "Uploading {0} objects ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649
-#, java-format
-msgid ""
-"Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
 msgid "Upload selection"
 msgstr "Upload selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258
 msgid "Checking parents for deleted objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:317
 #, java-format
 msgid "Reading parents of ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323
 msgid "Checking for deleted parents in the local dataset"
 msgstr ""
@@ -2067 +2241 @@
 "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 "
-"<strong>{2}</strong> to ignore.<br></html>"
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
 msgstr ""
 
@@ -2135 +2309 @@
 msgstr "geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 msgid "Cannot add a node outside of the world."
 msgstr "Kan geen knoop buiten de wereld toevoegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535
 msgid "Add node"
 msgstr "Knoop toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537
 msgid "Add node into way"
 msgstr "Knoop in weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Connect existing way to node"
 msgstr "Bestaande weg aan knoop koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
 msgid "Add a new node to an existing way"
 msgstr "Een nieuwe knoop aan een bestaande weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:944
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:968
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
 msgid "Select node under cursor."
 msgstr "Selecteer de node onder de cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:946
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2175 +2349 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:956
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Start new way from last node."
 msgstr "Start een nieuwe weg vanaf de node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:958
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:981
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
@@ -2219 +2393 @@
 #: ../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 "
@@ -2321 +2495 @@
 
 #. -- prepare the combo box with the search expressions
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "Please enter a filter string."
@@ -2364 +2538 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr ""
-"<b>\"Lange straat\"</b> - 'Lange' en 'straat' in een sleutel of naam."
+msgstr "<b>\"Lange straat\"</b> - 'Lange' en 'straat' in een sleutel of naam."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
@@ -2405 +2578 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
+#, fuzzy
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+msgstr "<b>gebruiker:</b>... - alle objecten veranderd door gebruiker"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - object met opgegeven aantal knopen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2418 +2596 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle aangepaste objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle geselecteerde objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle incomplete objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>ongetagd</b> - alle objecten zonder tag"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 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:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Gebruik <b>\"</b> om operanten aan te halen (b.v. als sleutel \":\" bevat)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 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:147
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2465 +2643 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Start Search"
 msgstr "Start zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Geen overeenkomst gevonden voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
 #, 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:273
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
 #, 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:275
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} overeenkomsten gevonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
 #, java-format
 msgid ""
@@ -2527 +2705 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Onverwacht token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590
 msgid "Missing arguments for or."
 msgstr "Ontbrekende argumenten voor OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
 msgid "Missing argument for not."
 msgstr "Ontbrekend argument voor NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
 msgid "Expected closing parenthesis."
 msgstr "Sluithaak verwacht."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672
 msgid "Wrong number of parameters for tags operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674
 #, java-format
 msgid ""
@@ -2569 +2747 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686
 #, java-format
 msgid ""
@@ -2580 +2758 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2631 +2809 @@
 #, java-format
 msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
+"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+#, fuzzy, java-format
+msgid ""
+"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
 "length {2}. Values length is {3}."
 msgstr ""
@@ -2774 +2951 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
 msgid "Double conflict"
 msgstr "Dubbel conflict"
@@ -2791 +2968 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:214
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 #, java-format
 msgid ""
@@ -2808 +2986 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:57
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103
+#, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59
+msgid "At least one object to delete required, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:105
-#, java-format
-msgid "Parameter ''{0}'' must not be empty"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:61
-msgid "At least one object to delete required, got empty collection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:107
 msgid "At least one object to delete requird, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} object"
@@ -2829 +3007 @@
 msgstr[1] "Verwijder {0} objecten"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182
 #, java-format
 msgid "Delete {0} node"
@@ -2836 +3014 @@
 msgstr[1] "Verwijder {0} knooppunten"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:185
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:183
 #, java-format
 msgid "Delete {0} way"
@@ -2843 +3021 @@
 msgstr[1] "Verwijder {0} wegen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:186
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:184
 #, java-format
 msgid "Delete {0} relation"
@@ -2852 +3030 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
-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?"
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125
+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?"
 msgstr ""
 "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
@@ -2863 +3041 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:444
 msgid "Delete confirmation"
 msgstr ""
@@ -2879 +3057 @@
 msgstr[1] "Verplaats {0} knooppunten"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
 #, java-format
 msgid "Purged {0} objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:154
 #, java-format
 msgid ""
@@ -2896 +3074 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -2904 +3082 @@
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
-msgid ""
-"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
 
@@ -2986 +3159 @@
 msgstr "Toepassen?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3130 +3303 @@
 #, 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 ""
 
@@ -3212 +3385 @@
 #. *
 #. * the decimal format 999.999
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
@@ -3219 +3392 @@
 #. *
 #. * the minutes/seconds format 99" 99'
-#. 
+#.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
@@ -3225 +3398 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "S"
 msgstr "Z"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "W"
 msgstr "W"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91
 msgid "E"
 msgstr "O"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3266 +3439 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #, java-format
 msgid "Missing merge target for way with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205
 #, java-format
 msgid "Missing merge target for object with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202
-#, java-format
-msgid "Missing merge target for node with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #, java-format
 msgid "Missing merge target for relation with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
@@ -3292 +3466 @@
 
 #. should not happen
-#. 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254
+#.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298
 #, java-format
 msgid ""
@@ -3354 +3528 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939
 msgid ""
 "Can''t merge because either of the participating primitives is new and the "
@@ -3379 +3553 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941
 #, java-format
 msgid ""
@@ -3409 +3583 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3429 +3603 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:33
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
@@ -3439 +3612 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114
 #, java-format
-msgid ""
-"Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
 msgstr ""
 
@@ -3449 +3621 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:476
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:922
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:930
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "The \"from\" way doesn't 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/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
 msgid "The \"to\" way doesn't 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/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "The \"from\" way doesn't 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/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "The \"to\" way doesn't 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/MapPaintVisitor.java:795
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738
 #, 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/MapPaintVisitor.java:891
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:903
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Binnenweg \"{0}\" is uitwendig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Niet-weg \"{0}\" in multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:994
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1054
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995
 #, 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/MapPaintVisitor.java:1084
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025
 #, 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/MapPaintVisitor.java:1392
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320
 msgid "untagged"
 msgstr "niet-getagd"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1393
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321
 msgid "text"
 msgstr "tekst"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1394
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322
 msgid "areatext"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475
 #, java-format
 msgid "Error: {0}"
 msgstr "Fout: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1643
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475
 #, java-format
 msgid "Warning: {0}"
@@ -3589 +3761 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
@@ -3606 +3778 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -3624 +3796 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "achtergrond"
@@ -3740 +3912 @@
 #: ../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 ""
 
@@ -3754 +3925 @@
 msgstr "Niet meer tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3760 +3931 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "snelweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 #: build/trans_presets.java:3186
 msgid "railway"
 msgstr "spoorweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "waterweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "grondgebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #, java-format
 msgid "{0} node"
@@ -3794 +3965 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3900 +4071 @@
 "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:59
@@ -4045 +4216 @@
 "gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
 msgid "File"
 msgstr "Bestand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
@@ -4064 +4235 @@
 msgstr "Bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 msgid "View"
 msgstr "Beeld"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24
 msgid "Tools"
 msgstr "Gereedschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Voorkeuze"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
@@ -4087 +4258 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:285
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291
 msgid "Audio"
 msgstr "Geluid"
@@ -4129 +4300 @@
 msgstr "schalen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "De geografische lengtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "De naam van het object bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "De geografische breedtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "De hoek tussen het vorige en het huidige wegsegment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "De (kompas)richting van het lijnsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "De lengte van het nieuwe wegsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4159 +4330 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
 msgid "(no object)"
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
@@ -4270 +4441 @@
 #. *
 #. * 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"
@@ -4277 +4448 @@
 #. *
 #. * 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"
@@ -4284 +4455 @@
 #. *
 #. * 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"
@@ -4301 +4472 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:233
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4316 +4487 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:269
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -4386 +4557 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:374
 #, java-format
 msgid "Parameter current out of range. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:586
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:610
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:759
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:773
 #, java-format
 msgid "Item {0} not found in list."
@@ -4480 +4651 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
-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 ""
 
@@ -4548 +4718 @@
 #, 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 ""
 
@@ -4555 +4725 @@
 #, 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 ""
 
@@ -4611 +4781 @@
 #, 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 ""
 
@@ -4643 +4813 @@
 #, java-format
 msgid ""
-"<html>There are {0} additional primitives referred to by relation "
-"{1}<br>which are deleted on the server.<br><br>Do you want to undelete them "
-"too?</html>"
+"<html>There are {0} additional primitives referred to by relation {1}"
+"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
+"</html>"
 msgstr ""
 
@@ -4789 +4959 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4922 +5092 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
 msgid "Apply"
 msgstr ""
@@ -5020 +5190 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
 #, java-format
 msgid "{0} way"
@@ -5030 +5200 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
 #, java-format
 msgid "{0} relation"
@@ -5063 +5233 @@
 msgstr ""
 
-#. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -5147 +5315 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 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:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
@@ -5220 +5387 @@
 #, java-format
 msgid ""
-"<html>You didn''t finish to merge the differences in this "
-"conflict.<br>Conflict resolutions won't be applied unless all "
-"differences<br>are resolved.Click <strong>{0}</strong> to close "
-"anyway.<strong>Already<br>resolved differences won't be "
-"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
-"conflicts.</html>"
+"<html>You didn''t finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
 
@@ -5298 +5464 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
 msgid "History"
 msgstr "Geschiedenis"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:132
 msgid "Display the history of all selected items."
 msgstr "De geschiedenis van alle geselecteerde items tonen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:246
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
@@ -5319 +5485 @@
 msgstr "Herladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Alle geselecteerde objecten herladen en de lijst verversen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303
 msgid "Show"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304
 msgid "Display the history of the selected objects."
 msgstr ""
@@ -5518 +5684 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5559 +5725 @@
 msgstr "Op selectie inzoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "Selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5586 +5752 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
@@ -5598 +5764 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 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:133
@@ -5645 +5810 @@
 msgstr "# Objecten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
 msgid "Download all child relations (recursively)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
 msgid "Download All Children"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
 msgid "Download selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
 msgid "Download Selected Children"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:41
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
 msgid "Download relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482
 msgid "Conflicts in data"
 msgstr "Tegenstrijdigheden in de gegevens"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342
 #, java-format
 msgid ""
@@ -5684 +5849 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351
 msgid "Relation is deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:408
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517
 #, java-format
 msgid "Downloading relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:108
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85
+#, fuzzy, java-format
+msgid "Downloading {0} incomplete child of relation ''{1}''"
+msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
+msgstr[0] "Alle incomplete wegen en daarbij behorende knopen downloaden"
+msgstr[1] "Alle incomplete wegen en daarbij behorende knopen downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+#, fuzzy
+msgid "Download relations"
+msgstr "Locatie downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
+#, java-format
+msgid "({0}/{1}: Downloading relation ''{2}''..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
+msgid "Tags and Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
-msgid "Tags and Members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
+#, fuzzy
+msgid "Apply Role:"
+msgstr "Voorinstelling toepassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
+#, fuzzy
+msgid "Enter a role and apply it to the selected relation members"
+msgstr "Een editor voor de geselecteerde relatie openen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
 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>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
 #, java-format
 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>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620
 #, java-format
 msgid ""
@@ -5750 +5943 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5766 +5959 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5772 +5965 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
 #, java-format
 msgid ""
@@ -5794 +5987 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871
 msgid "Sort the relation members"
 msgstr ""
 
-#. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
+#, fuzzy
+msgid "Sort"
+msgstr "Sport"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Move the currently selected members up"
 msgstr "De geselecteerde leden omhoog verplaatsen"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members down"
 msgstr "De geselecteerde leden omlaag verplaatsen"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047
 msgid "No, continue editing"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
+msgid ""
+"Click to to return to the relation editor and to resume relation editing"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
-msgid ""
-"Click to to return to the relation editor and to resume relation editing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5862 +6059 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for "
-"primitive<br>''{1}''.<br>Please resolve this conflict first, then try "
-"again.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
-msgid "Download all incomplete ways and nodes in relation"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
+#, fuzzy
+msgid "Download all incomplete members"
 msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Download Members"
 msgstr "Leden downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
+msgid "Download selected incomplete members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
 #, java-format
 msgid ""
@@ -5918 +6121 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
 
-#. download the relation
-#. 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427
-#, java-format
-msgid "Downloading relation ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to the object the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5992 +6188 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
 msgid "Apply Changes"
 msgstr "Wijzigingen toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:133
 #, java-format
 msgid "Create new relation in layer ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135
 #, java-format
 msgid "Edit new relation in layer ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137
 #, java-format
 msgid "Edit relation #{0} in layer ''{1}''"
@@ -6016 +6212 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: "
+msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
 
@@ -6174 +6369 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
 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:221
@@ -6198 +6392 @@
 #, 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 ""
 
@@ -6971 +7164 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7206 +7399 @@
 "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>"
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
 msgstr ""
 
@@ -7215 +7408 @@
 "<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 ""
 
@@ -7477 +7670 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Changeset info"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121
 msgid "Launch browser with information about the changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140
 #, java-format
 msgid "Show changeset {0}"
@@ -7584 +7777 @@
 #: ../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 ""
 
@@ -7668 +7860 @@
 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] ""
@@ -7681 +7873 @@
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which can't 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 can't be "
@@ -7735 +7927 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -7741 +7933 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -7812 +8004 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
 msgid "Settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
 msgid "Objects to add:"
 msgstr "Objecten om toe te voegen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
 msgid "Objects to modify:"
 msgstr "Objecten om te bewerken:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
 msgid "Objects to delete:"
 msgstr "Objecten om aan te verwijderen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
 #, java-format
 msgid "{0} object to add:"
@@ -7854 +8046 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
 #, java-format
 msgid "{0} object to modify:"
@@ -7861 +8053 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
 #, java-format
 msgid "{0} object to delete:"
@@ -7868 +8060 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
 msgid "Illegal upload comment"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513
+#, fuzzy
+msgid "Please enter a valid chunk size first"
+msgstr "Voer eerst de gewenste coördinaten in."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514
+msgid "Illegal chunk size"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624
-msgid "Upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Beschrijf kort de veranderingen die je upload:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660
 msgid "Enter an upload comment (min. 3 characters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718
 msgid "Open a new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726
 msgid "Use an open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727
 msgid "Upload data to an already opened changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767
 msgid "Close changeset after upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768
 msgid "Select to close the changeset after the next upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7937 +8128 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040
 msgid "Load the list of your open changesets from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054
 msgid "Close the currently selected open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
@@ -7954 +8145 @@
 
 #. we tried to delete an already deleted primitive.
-#. 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98
 #, java-format
 msgid ""
@@ -7962 +8153 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7990 +8181 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
-#, java-format
-msgid "Images for {0}"
-msgstr "Afbeeldingen van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
-msgid "Read GPX..."
-msgstr "GPX inlezen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Geen tijd voor punt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lezen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354
-msgid "No images with readable timestamps found."
-msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276
-msgid "Geotagged Images"
-msgstr "Geotagged afbeeldingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS-start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-einde: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Huidige verschil: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
-msgid "timezone difference: "
-msgstr "Tijdzoneverschil: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
-msgid "image"
-msgid_plural "images"
-msgstr[0] "afbeelding"
-msgstr[1] "afbeeldingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} binnen de track."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-msgid "Sync clock"
-msgstr "Klok synchroniseren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-afbeeldingen (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761
-msgid "Image"
-msgstr "Afbeelding"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778
-msgid "Synchronize Time with GPS Unit"
-msgstr "Syncroniseer tijd met GPS-apparaat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808
-msgid "Time entered could not be parsed."
-msgstr "Ingevoerde tijd kon niet worden ontleed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
+#, java-format
+msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71
+msgid "Upload data in one request"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90
+msgid "Upload data in chunks of objects. Chunk size: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115
+msgid "Upload each object individually"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206
+msgid "(1 request)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217
+msgid "(# requests unknown)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221
+#, fuzzy, java-format
+msgid "({0} request)"
+msgid_plural "({0} requests)"
+msgstr[0] "{0} meters"
+msgstr[1] "{0} meters"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260
+msgid "Illegal chunk size <= 0. Please enter an integer > 1"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262
+#, fuzzy
+msgid "Please enter an integer > 1"
+msgstr "Voer een gebruikersnaam in"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265
+#, java-format
+msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
@@ -8102 +8237 @@
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
@@ -8133 +8268 @@
 msgstr "Kleur aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -8140 +8275 @@
 msgstr "Standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -8147 +8282 @@
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:218
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points don''t include a timestamp we can''t correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:313
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:301
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
-"server.<br>Because its way points don''t include a timestamp we can''t "
-"correlate them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:306
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points don''t include a timestamp we can''t correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-afbeeldingen (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
 msgid "Name: {0}"
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -8206 +8346 @@
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:388
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:389
 #, java-format
 msgid "{0} track"
@@ -8214 +8354 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 #: build/trans_presets.java:3190
@@ -8220 +8360 @@
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:443
 msgid "Length: "
 msgstr "Lengte: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} route, "
@@ -8244 +8379 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:447
 #, java-format
 msgid "{0} waypoint"
@@ -8251 +8386 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered "
-"harmful.<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
+msgid ""
+"<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 "
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
@@ -8278 +8413 @@
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 #, java-format
 msgid ""
@@ -8311 +8446 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8323 +8458 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8331 +8466 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gegevenslaag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
 #, java-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8356 +8491 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid ""
@@ -8368 +8503 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
 #, java-format
 msgid ""
@@ -8379 +8514 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
 #, java-format
 msgid "{0} deleted"
@@ -8392 +8527 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 #, java-format
 msgid "API version: {0}"
 msgstr "API-versie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
 msgid "Convert to GPX layer"
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721
 msgid "Dataset consistency test"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727
+msgid "No problems found"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730
-msgid "No problems found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733
 msgid "Following problems found:"
 msgstr ""
@@ -8425 +8560 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 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 ""
 
@@ -8463 +8598 @@
 msgstr[1] "{0} punten"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131
+msgid "GPX Files (*.gpx *.gpx.gz)"
+msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152
+#, java-format
+msgid "File {0} is loaded yet under the name \"{1}\""
+msgstr "Bestand {0} is geladen met de naam \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Fout tijdens ontleden {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Kan \"{0}\" niet lezen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224
+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>"
+msgstr ""
+"<html>Maak een opname van je GPS-ontvanger met de tijd weergegeven.<br>Toon "
+"deze foto hier.<br>Voer vervolgens de afgebeelde tijd hier in en selecteer "
+"een tijdzone<hr></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
+msgid "Photo time (from exif):"
+msgstr "Fototijd (uit exif):"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
+msgid "Gps time (read from the above photo): "
+msgstr "GPS-tijd (lees uit de bovenstaande foto): "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
+msgid " [dd/mm/yyyy hh:mm:ss]"
+msgstr " [dd/mm/yyyy hh:mm:ss]"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277
+msgid "I'm in the timezone of: "
+msgstr "Ik bevind mij in tijdzone: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376
+msgid "No date"
+msgstr "Geen datum"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349
+msgid "Open an other photo"
+msgstr "Open een andere foto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+msgid "Synchronize time from a photo of the GPS receiver"
+msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+msgid ""
+"Error while parsing the date.\n"
+"Please use the requested format"
+msgstr ""
+"Het ontleden van de datum is mislukt.\n"
+"Gebruik de verwachte indeling a.u.b."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+msgid "Invalid date"
+msgstr "Ongeldige datum"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449
+msgid "<No GPX track loaded yet>"
+msgstr "<Nog geen GPX-track geladen>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455
+msgid "GPX track: "
+msgstr "GPX-track: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460
+msgid "Open another GPX trace"
+msgstr "Een ander GPX-spoor openene"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476
+msgid "Timezone: "
+msgstr "Tijdzone: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498
+msgid "Offset:"
+msgstr "Verschuiving:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
+msgid "<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>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+msgid "Update position for: "
+msgstr "Locatie bijwerken van: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+msgid "All images"
+msgstr "Alle afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546
+msgid "Images with no exif position"
+msgstr "Afbeelding zonder EXIF-locatie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
+msgid "Not yet tagged images"
+msgstr "Nog niet getagde afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577
+msgid "Correlate images with GPX track"
+msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
+msgid "Correlate"
+msgstr "Correleer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
+msgid "Auto-Guess"
+msgstr "Automatisch schatten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592
+msgid "You should select a GPX track"
+msgstr "U mag een GPX-track selecteren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593
+msgid "No selected GPX track"
+msgstr "Geen GPX-tracks geselecteerd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605
+#, java-format
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Ontleden van tijdzone is mislukt.\n"
+"Verwachte indeling: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606
+msgid "Invalid timezone"
+msgstr "Ongeldige tijdzone"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618
+#, java-format
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Ontleden van verschuiving is mislukt.\n"
+"Verwachte indeling: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619
+msgid "Invalid offset"
+msgstr "Ongeldige verschuiving"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
+#, java-format
+msgid "Found {0} matches of {1} in GPX track {2}"
+msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660
+msgid "GPX Track loaded"
+msgstr "GPX-track geladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
+msgid "The selected photos don't contain time information."
+msgstr "De selecteerde foto's bevatten geen tijdinformatie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696
+msgid "Photos don't contain time information"
+msgstr "Foto's bevatten geen tijdinformatie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730
+msgid ""
+"The selected GPX track doesn't contain timestamps. Please select another one."
+msgstr ""
+"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731
+msgid "GPX Track has no time information"
+msgstr "GPX-track heeft geen tijdinformatie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776
+#, java-format
+msgid "Timezone: {0}"
+msgstr "Tijdzone: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777
+#, java-format
+msgid "Minutes: {0}"
+msgstr "Minuten: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778
+#, java-format
+msgid "Seconds: {0}"
+msgstr "Seconden: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795
+#, java-format
+msgid "Matched {0} of {1} photos to GPX track."
+msgstr "{0} van de {1} foto's komen overeen met GPX-track."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798
+#, java-format
+msgid "(Time difference of {0} days)"
+msgstr "(Tijdverschil van {0} dagen)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805
+#, java-format
+msgid "Offset between track and photos: {0}m {1}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+msgid ""
+"An error occurred while trying to match the photos to the GPX track. You can "
+"adjust the sliders to manually match the photos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869
+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:885
+msgid "Adjust timezone and offset"
+msgstr "Tijdzone en tijdverschil aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
+msgid "Default Values"
+msgstr "Standaardwaarden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
+msgid "Extracting GPS locations from EXIF"
+msgstr "GPS-locaties uit EXIF halen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130
+msgid "Starting directory scan"
+msgstr "Mappenscan starten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135
+msgid "One of the selected files was null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144
+msgid "Read photos..."
+msgstr "Foto's lezen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lezen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#, java-format
+msgid "Unable to get canonical path for directory {0}\n"
+msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210
+#, java-format
+msgid "Scanning directory {0}"
+msgstr "Map {0} scannen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215
+#, java-format
+msgid "Found null file in directory {0}\n"
+msgstr "Leeg bestand in {0} gevonden\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218
+#, java-format
+msgid "Error while getting files from directory {0}\n"
+msgstr "Bestanden uit map {0} halen is mislukt\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
+msgid "Geotagged Images"
+msgstr "Geotagged afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352
+msgid "Correlate to GPX"
+msgstr "Met GPX relateren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370
+msgid "image"
+msgid_plural "images"
+msgstr[0] "afbeelding"
+msgstr[1] "afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371
+#, java-format
+msgid "{0} were found to be gps tagged."
+msgstr "{0} zijn getagd als GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+msgid "No image"
+msgstr "Geen afbeelding"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452
+#, java-format
+msgid "Loading {0}"
+msgstr "{0} laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481
+#, java-format
+msgid "Error on file {0}"
+msgstr "Bestand {0} gaat fout"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
+#, fuzzy
+msgid "Display geotagged images"
+msgstr "Toon geogetagde foto's"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89
+msgid "Remove photo from layer"
+msgstr "Foto uit laag verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next"
+msgstr "Volgende"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
+msgid "Center view"
+msgstr "Beeld centreren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+msgid "Zoom best fit and 1:1"
+msgstr "Zoom optimaal en 1:1"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186
+#, java-format
+msgid ""
+"\n"
+"Altitude: {0} m"
+msgstr ""
+"\n"
+"Hoogte: {0} m"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189
+#, java-format
+msgid ""
+"\n"
+"{0} km/h"
+msgstr ""
+"\n"
+"{0} km/h"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
@@ -8522 +9011 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 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:171
@@ -8643 +9131 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
 msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
-"Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
+msgstr "Trackstart (doet dit altijd als geen andere markers beschikbaar zijn)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
@@ -8783 +9270 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8817 +9304 @@
 #: ../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)"
+msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
@@ -8978 +9464 @@
 #. drawGpsArrowsFast
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
-msgid ""
-"Draw the direction arrows using table lookups instead of complex math."
+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 "
@@ -9044 +9529 @@
 #. antialiasing
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
-msgid ""
-"Apply antialiasing to the map view resulting in a smoother appearance."
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Anti-aliasing op het kaartbeeld toepassen, met een vloeiender uiterlijk als "
@@ -9115 +9599 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:70
 msgid "Look and Feel"
 msgstr "Weergave en Vormgeving"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:57
+msgid "Language"
+msgstr "Taal"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:113
+msgid "Looking up available translations..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:196
 msgid "Default (Auto determined)"
 msgstr "Standaard (automatisch bepaald)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:66
-msgid "Language"
-msgstr "Taal"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:112
-msgid "Looking up available translations..."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
@@ -9230 +9714 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:108
 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:79
@@ -9256 +9739 @@
 #, 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/ProxyPreferences.java:35
@@ -9389 +9871 @@
 #, 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 ""
 
@@ -9454 +9936 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion 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 ""
 "<p>Daarnaast worden de sneltoetsen geactiveerd als de opdrachten voor de "
@@ -9471 +9953 @@
 "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
 "there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key "
-"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
-"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>"
+"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
+"Semicolon on US keyboards, '.'/Period on German keyboards, ...) 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 ""
 "<p>Het kan je opgevallen zijn dat de toetsenselectielijst op de volgende "
@@ -9486 +9967 @@
 "':'). Gebruik deze ook niet, maar in plaats daarvan de basistoets (';' op US-"
 "toetsenborden, '.' op Duitse toetsenborden, enz.). Als je deze regels "
-"overtreedt kunnen er conflicten ontstaan omdat JOSM niet kan weten dat "
-"CTRL+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk hetzelfde is...</p>"
+"overtreedt kunnen er conflicten ontstaan omdat JOSM niet kan weten dat CTRL"
+"+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk hetzelfde is...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177
@@ -9513 +9994 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
-"encountered.</p>"
+"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
+"</p>"
 msgstr ""
 "<p>De pseudo-aanpasser 'uitgeschakeld' zal de sneltoets uitschakelen als het "
@@ -9607 +10088 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
@@ -9692 +10173 @@
 msgstr "Downloaden van punten {0} tot {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
 #, java-format
@@ -9698 +10179 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
 #, java-format
 msgid ""
@@ -9818 +10299 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115
-#, java-format
-msgid ""
-"No primitive with id {0} in local dataset. Can't infer primitive type."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116
+#, java-format
+msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
@@ -9853 +10333 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
 "for each primitive."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450
+#, fuzzy, java-format
+msgid "Downloading {0} object from ''{1}''"
+msgid_plural "Downloading {0} objects from ''{1}''"
+msgstr[0] "Downloaden van punten {0} tot {1}..."
+msgstr[1] "Downloaden van punten {0} tot {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -9912 +10399 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174
-#, java-format
-msgid ""
-"It supports protocol versions 0.5 and 0.6, while the server says it supports "
-"{0} to {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
+#, java-format
+msgid ""
+"It supports protocol version 0.6, while the server says it supports {0} to "
+"{1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263
 #, java-format
 msgid ""
@@ -9940 +10427 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
 msgid "Closing changeset..."
 msgstr "Changeset sluiten"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394
 msgid "No changeset present for diff upload."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
 msgid "Preparing..."
 msgstr "Voorbereiden…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
 msgid "Uploading..."
 msgstr "Uploaden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600
 msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -10034 +10521 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -10059 +10546 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -10065 +10552 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184
 #, java-format
 msgid "Unsupported version: {0}"
@@ -10076 +10563 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -10133 +10620 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences "
-"file.<br>The password is transferred in plain text to the server, encoded in "
-"the URL.<br><b>Do not use a valuable Password.</b></html>"
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -10161 +10648 @@
 #, 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 ""
 
@@ -10226 +10713 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
-#, java-format
-msgid ""
-"Missing manadatory attributes on element ''bounds''. Got "
-"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269
-#, java-format
-msgid ""
-"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277
 #, java-format
 msgid ""
@@ -10273 +10759 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member>-specificatie met ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324
 msgid "Illegal object with ID=0."
 msgstr "Ongeldig object met id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
 #, java-format
 msgid ""
@@ -10295 +10781 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378
 #, java-format
 msgid ""
@@ -10306 +10792 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
 #, java-format
 msgid ""
@@ -10332 +10818 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447
 #, java-format
 msgid ""
@@ -10339 +10825 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496
 #, java-format
 msgid ""
@@ -10345 +10831 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
 #, java-format
 msgid ""
@@ -10352 +10838 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563
 msgid "Preparing data set..."
 msgstr ""
@@ -10411 +10897 @@
 msgid "Contacting Server..."
 msgstr "Met server verbinden..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62
+#, java-format
+msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
@@ -10447 +10939 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:78
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:86
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:87
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:120
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
+#, java-format
+msgid "Value >0 expected for parameter ''{0}'', got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
+msgid "Starting to upload in chunks..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151
+#, java-format
+msgid "({0}/{1}) Uploading {2} objects..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
 msgid "Uploading data ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148
-msgid ""
-"WARNING: no API version defined for data to upload. Falling back to version "
-"0.6"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153
-#, java-format
-msgid ""
-"WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-"use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
 
@@ -10524 +11017 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146
+#, fuzzy, java-format
+msgid "Delete old plugin {0}"
+msgstr "{1} {0} verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153
+#, fuzzy, java-format
+msgid "Delete old plugin file {0}"
+msgstr "Fout tijdens verwijderen plugin-bestand: {0}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:167
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:142
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:169
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10546 +11049 @@
 msgstr "Een fout opgetreden in plugin {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
-#, java-format
-msgid ""
-"Loading of {0} plugin was requested. This plugin is no longer required."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#, java-format
+msgid "Plugin {0} is no longer necessary and has been deactivated."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
 #, java-format
 msgid ""
 "<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
-"developed and very likely will produce errors.<br>It should be "
-"disabled.<br>Delete from preferences?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+"developed and very likely will produce errors.<br>It should be disabled."
+"<br>Delete from preferences?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102
 msgid ""
 "You updated your JOSM software.\n"
@@ -10567 +11069 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:115
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Laatste plugin-update is meer dan {0} dagen geleden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 msgid "Update plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 msgid "Skip update"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin niet gevonden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:212
 #, 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:220
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 msgid "Disable plugin"
 msgstr "Plugin uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10620 +11122 @@
 "rechten heeft om de bestaande plugins te overschrijven."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:316
 #, 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:318
+"Een onverwachte uitzondering is opgetreden, mogelijk afkomstig van de \"{0}"
+"\"-plugin."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:319
 #, 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:321
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10644 +11146 @@
 "fout rapporteert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324
 msgid "Should the plugin be disabled?"
 msgstr "Moet de plugin worden uitgeschakeld?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10656 +11158 @@
 "uit de applicatie te halen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:386
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
@@ -10781 +11283 @@
 "<html><p>There the the error information provided below should already "
 "be<br>filled out for you. Please include information on how to "
-"reproduce<br>the error and try to supply as much detail as "
-"possible.</p></html>"
+"reproduce<br>the error and try to supply as much detail as possible.</p></"
+"html>"
 msgstr ""
 
@@ -10818 +11320 @@
 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 ""
 
@@ -10879 +11381 @@
 #, 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 ""
 
@@ -10891 +11392 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 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 ""
 
@@ -10923 +11424 @@
 "<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>"
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 
@@ -11180 +11681 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
 #: build/trans_presets.java:2296
 msgid "Address Interpolation"
@@ -11193 +11694 @@
 msgstr ""
 
-#. NOTE: The following 2 arrays must match in number of elements and position
-#. Tag values for map
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Oneven"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -11206 +11705 @@
 msgstr "Even"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+#, fuzzy
+msgid "Numeric"
+msgstr "Nummer"
+
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+#, fuzzy
+msgid "Actual"
+msgstr "Natuurlijk"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+#, fuzzy
+msgid "Estimate"
+msgstr "afbeelding"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+#, fuzzy
+msgid "Potential"
+msgstr "Verhuur"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:213
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
+#, fuzzy
+msgid "Increment:"
+msgstr "binnensegment"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
+msgid "Accuracy:"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
+msgid "Convert way to individual house numbers."
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
+msgid "Expected valid number for address increment"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Starting address number must be less than ending address number"
 msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-msgid "AgPifoJ - Geotagged pictures"
-msgstr "AgPifoJ - Geotagged-afbeeldingen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
-msgid "Display geotagged photos"
-msgstr "Toon geogetagde foto's"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78
-msgid "Remove photo from layer"
-msgstr "Foto uit laag verwijderen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
-msgid "Next"
-msgstr "Volgende"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
-msgid "Center view"
-msgstr "Beeld centreren"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
-msgid "Zoom best fit and 1:1"
-msgstr "Zoom optimaal en 1:1"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
-#, java-format
-msgid ""
-"\n"
-"Altitude: {0} m"
-msgstr ""
-"\n"
-"Hoogte: {0} m"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169
-#, java-format
-msgid ""
-"\n"
-"{0} km/h"
-msgstr ""
-"\n"
-"{0} km/h"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
-msgid "Extracting GPS locations from EXIF"
-msgstr "GPS-locaties uit EXIF halen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:121
-msgid "Starting directory scan"
-msgstr "Mappenscan starten"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126
-msgid "One of the selected files was null"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:132
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:135
-msgid "Read photos..."
-msgstr "Foto's lezen..."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:186
-#, java-format
-msgid "Unable to get canonical path for directory {0}\n"
-msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
-#, java-format
-msgid "Scanning directory {0}"
-msgstr "Map {0} scannen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:204
-#, java-format
-msgid "Found null file in directory {0}\n"
-msgstr "Leeg bestand in {0} gevonden\n"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:207
-#, java-format
-msgid "Error while getting files from directory {0}\n"
-msgstr "Bestanden uit map {0} halen is mislukt\n"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:296
-msgid "Correlate to GPX"
-msgstr "Met GPX relateren"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315
-#, java-format
-msgid "{0} were found to be gps tagged."
-msgstr "{0} zijn getagd als GPS"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46
-msgid "Open images with AgPifoJ..."
-msgstr "Afbeeldingen openen met AGPifoJ..."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
-msgid "Load set of images as a new layer."
-msgstr "Verzameling afbeeldingen laden als een nieuwe laag."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
-msgid "GPX Files (*.gpx *.gpx.gz)"
-msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
-#, java-format
-msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "Bestand {0} is geladen met de naam \"{1}\""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
-#, java-format
-msgid "Error while parsing {0}"
-msgstr "Fout tijdens ontleden {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Kan \"{0}\" niet lezen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
-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>"
-msgstr ""
-"<html>Maak een opname van je GPS-ontvanger met de tijd weergegeven.<br>Toon "
-"deze foto hier.<br>Voer vervolgens de afgebeelde tijd hier in en selecteer "
-"een tijdzone<hr></html>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
-msgid "Photo time (from exif):"
-msgstr "Fototijd (uit exif):"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257
-msgid "Gps time (read from the above photo): "
-msgstr "GPS-tijd (lees uit de bovenstaande foto): "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269
-msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr " [dd/mm/yyyy hh:mm:ss]"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277
-msgid "I'm in the timezone of: "
-msgstr "Ik bevind mij in tijdzone: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
-msgid "No date"
-msgstr "Geen datum"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349
-msgid "Open an other photo"
-msgstr "Open een andere foto"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390
-msgid "Synchronize time from a photo of the GPS receiver"
-msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404
-msgid ""
-"Error while parsing the date.\n"
-"Please use the requested format"
-msgstr ""
-"Het ontleden van de datum is mislukt.\n"
-"Gebruik de verwachte indeling a.u.b."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406
-msgid "Invalid date"
-msgstr "Ongeldige datum"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449
-msgid "<No GPX track loaded yet>"
-msgstr "<Nog geen GPX-track geladen>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455
-msgid "GPX track: "
-msgstr "GPX-track: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460
-msgid "Open another GPX trace"
-msgstr "Een ander GPX-spoor openene"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476
-msgid "Timezone: "
-msgstr "Tijdzone: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498
-msgid "Offset:"
-msgstr "Verschuiving:"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
-msgid ""
-"<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>"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
-msgid "Update position for: "
-msgstr "Locatie bijwerken van: "
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536
-msgid "All images"
-msgstr "Alle afbeeldingen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546
-msgid "Images with no exif position"
-msgstr "Afbeelding zonder EXIF-locatie"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556
-msgid "Not yet tagged images"
-msgstr "Nog niet getagde afbeeldingen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
-msgid "Correlate images with GPX track"
-msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
-msgid "Correlate"
-msgstr "Correleer"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
-msgid "Auto-Guess"
-msgstr "Automatisch schatten"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592
-msgid "You should select a GPX track"
-msgstr "U mag een GPX-track selecteren"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:593
-msgid "No selected GPX track"
-msgstr "Geen GPX-tracks geselecteerd"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
-#, java-format
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Ontleden van tijdzone is mislukt.\n"
-"Verwachte indeling: {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:606
-msgid "Invalid timezone"
-msgstr "Ongeldige tijdzone"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
-#, java-format
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Ontleden van verschuiving is mislukt.\n"
-"Verwachte indeling: {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:619
-msgid "Invalid offset"
-msgstr "Ongeldige verschuiving"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659
-#, java-format
-msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr "{0} overeenkomsten van {1} gevonden in GPX-track {2}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:660
-msgid "GPX Track loaded"
-msgstr "GPX-track geladen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695
-msgid "The selected photos don't contain time information."
-msgstr "De selecteerde foto's bevatten geen tijdinformatie."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:696
-msgid "Photos don't contain time information"
-msgstr "Foto's bevatten geen tijdinformatie."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
-msgstr ""
-"De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731
-msgid "GPX Track has no time information"
-msgstr "GPX-track heeft geen tijdinformatie"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
-#, java-format
-msgid "Timezone: {0}"
-msgstr "Tijdzone: {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
-#, java-format
-msgid "Minutes: {0}"
-msgstr "Minuten: {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
-#, java-format
-msgid "Seconds: {0}"
-msgstr "Seconden: {0}"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795
-#, java-format
-msgid "Matched {0} of {1} photos to GPX track."
-msgstr "{0} van de {1} foto's komen overeen met GPX-track."
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798
-#, java-format
-msgid "(Time difference of {0} days)"
-msgstr "(Tijdverschil van {0} dagen)"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805
-#, java-format
-msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
-msgid ""
-"An error occurred while trying to match the photos to the GPX track. You can "
-"adjust the sliders to manually match the photos."
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
-msgid "Matching photos to track failed"
-msgstr "Koppelen van foto's aan track is mislukt"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
-msgid "Adjust timezone and offset"
-msgstr "Tijdzone en tijdverschil aanpassen"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
-msgid "Default Values"
-msgstr "Standaardwaarden"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
-msgid "No image"
-msgstr "Geen afbeelding"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:443
-#, java-format
-msgid "Loading {0}"
-msgstr "{0} laden"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:445
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:472
-#, java-format
-msgid "Error on file {0}"
-msgstr "Bestand {0} gaat fout"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
@@ -11770 +11957 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 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:32
@@ -11800 +11986 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 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.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."
+"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."
 msgstr ""
 
@@ -12126 +12311 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:63
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137
-#, java-format
-msgid "Simplify Way (remove {0} node)"
-msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Vereenvoudig weg (verwijder {0} knoop)"
-msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
@@ -12247 +12424 @@
 msgstr "Kleurenschema's"
 
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:37
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+msgid "Split area"
+msgstr ""
+
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
-msgid "Split area"
-msgstr ""
-
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
 msgid "Splits an area by an untagged way."
 msgstr ""
 
-#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
 msgid ""
 "The selected area cannot be splitted, because it is a member of some "
@@ -12464 +12641 @@
 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:105
@@ -12565 +12742 @@
 msgstr "Afbeeldingen met ImageWayPoint openen"
 
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
+msgid "Load set of images as a new layer."
+msgstr "Verzameling afbeeldingen laden als een nieuwe laag."
+
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
 msgid "Direction index '{0}' not found"
@@ -12606 +12787 @@
 #. *
 #. * Run the nodelist through a vertex reduction algorithm
-#. 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:187
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
 msgid "Running vertex reduction..."
 msgstr "Knooppunten reductie uitvoeren..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:198
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
 msgid "Running Douglas-Peucker approximation..."
 msgstr "Douglas-Peuckerbenadering uitvoeren..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:209
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
 msgid "Removing duplicate nodes..."
 msgstr "Dubbele knopen verwijderen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:285
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
 msgid "Lakewalker trace"
@@ -12666 +12847 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--waterway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="river"/>
@@ -12676 +12857 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="canal"/>
@@ -12684 +12865 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="drain"/>
@@ -12691 +12872 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="water"/>
@@ -12699 +12880 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="coastline"/>
@@ -12775 +12956 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
-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)."
@@ -12798 +12978 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 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."
 
@@ -12866 +13045 @@
 msgstr "Kan afbeelding niet ophalen"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:105
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:121
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:181
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210
 msgid "Connected"
 msgstr "Verbonden"
 
-#. not connected:
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:193
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:209
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:202
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239
 msgid "Connection Failed"
 msgstr "Verbinding is mislukt"
@@ -12926 +13104 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 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:55
@@ -13084 +13261 @@
 "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
@@ -13100 +13277 @@
 
 #: ../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"
@@ -13183 +13359 @@
 msgstr "Onbekende bestandsextentie: {0}"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:41
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:45
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:137
 msgid "Osmarender"
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:95
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:99
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -13195 +13372 @@
 "kaartinstellingenpagina van Voorkeuren."
 
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126
-msgid "osmarender options"
-msgstr "osmarender-optie"
-
-#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:127
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:133
 msgid "Firefox executable"
 msgstr "Firefox-executable"
@@ -13574 +13747 @@
 msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
 msgid "Reverse a terrace"
 msgstr "Het terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
 msgid "Reverses house numbers on a terrace."
 msgstr "De huisnummers op een terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
 msgid "Reverse a Terrace"
 msgstr "Een terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
 msgid "Reverse Terrace"
 msgstr ""
@@ -13628 +13801 @@
 msgid "Optional"
 msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-msgid "Join overlapping Areas"
-msgstr "Overlappende gebieden samenvoegen"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-msgid "Joins areas that overlap each other"
-msgstr "Overlappende gebieden samenvoegen"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127
-msgid "Only up to two areas can be joined at the moment."
-msgstr "Op dit moment kunnen maximaal twee gebieden worden samengevoegd."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132
-#, java-format
-msgid "\"{0}\" is not closed and therefore can't be joined."
-msgstr "\"{0}\" is niet gesloten en kan daarom niet worden samengevoegd."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65
-msgid ""
-"The selected way(s) have nodes outside of the downloaded data region.\n"
-"This can lead to nodes being deleted accidentally.\n"
-"Are you really sure to continue?"
-msgstr ""
-"Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
-"gegevensgebied.\n"
-"Hierdoor kunnen knopen onbedoeld gewist worden.\n"
-"Weet je zeker dat je verder wilt gaan?"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68
-msgid "Please abort if you are not sure"
-msgstr "Breek af als je het niet zeker weet"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166
-msgid "Please select at least one closed way the should be joined."
-msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
-msgid "No intersection found. Nothing was changed."
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
-msgid "Added node on all intersections"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
-msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
-msgid "Fix relations"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
-msgid "Joined self-overlapping area"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
-msgid "Joined overlapping areas"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
-msgid ""
-"Some of the ways were part of relations that have been modified. Please "
-"verify no errors have been introduced."
-msgstr ""
-"Enkele wegen vormden onderdeel van relaties die zijn aangepast. Controleer "
-"of er geen fouten zijn geïntroduceerd."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
-msgid "Enter values for all conflicts."
-msgstr "Waarden voor alle conflicten invoeren."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
-msgid "Solve Conflicts"
-msgstr "Conflicten oplossen"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
-msgid "Fix tag conflicts"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
-msgid "Removed Element from Relations"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
-msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
-msgid "Closed Way"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
-msgid "Remove tags from inner ways"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
-msgid "Join Areas Function"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
-msgid "Jump To Position"
-msgstr "Naar positie springen"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
-msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
-"Een dialoogvenster openen waarmee naar een bepaalde locatie kan worden "
-"gesprongen."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
-msgid "Enter Lat/Lon to jump to position."
-msgstr "Lat/lon invoeren om naar toe te springen."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56
-msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "Je kunt ook een URL van www.openstreetmap.org inplakken."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
-msgid "Zoom (in metres)"
-msgstr "Zoom (in metres)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-msgid "Jump there"
-msgstr "Spring daarheen"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101
-msgid "Jump to Position"
-msgstr "Spring naar positie"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
-msgid "Could not parse Latitude, Longitude or Zoom. Please check."
-msgstr ""
-"Kan lengte- of breedtegraad of zoom niet ontleden. Controleer deze s.v.p."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
-msgid "Unable to parse Lon/Lat"
-msgstr "Kan lat/lon niet ontleden."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-msgid "Simplify Way"
-msgstr "Weg vereenvoudigen"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
-msgid "Delete unnecessary nodes from a way."
-msgstr "Ongebruikte knopen van een weg verwijderen."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83
-msgid "Please select at least one way to simplify."
-msgstr "Selecteer minimaal één weg om te vereenvoudigen."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88
-#, 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?"
-msgstr[0] ""
-"De selectie bevat {0} weg. Weet je zeker dat je deze wilt vereenvoudigen?"
-msgstr[1] ""
-"De selectie bevat {0} wegen. Weet je zeker dat je ze allemaal wilt "
-"vereenvoudigen?"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91
-msgid "Are you sure?"
-msgstr "Weet je het zeker?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
@@ -13893 +13898 @@
 msgstr "Validatie andere"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
 #, java-format
 msgid "Running test {0}"
@@ -13944 +13949 @@
 msgstr "De geselecteerde fouten de volgende keer negeren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Whole group"
 msgstr "Gehele groep"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Single elements"
 msgstr "Individuele elementen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:196
 msgid "Nothing"
 msgstr "Niets"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Ignore whole group or individual elements?"
 msgstr "Gehele groep of individuele elementen negeren?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
 msgid "Ignoring elements"
 msgstr "Elementen negeren"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:459
 msgid "Fixing errors ..."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:483
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:500
 msgid "Updating map ..."
 msgstr ""
@@ -14020 +14025 @@
 msgstr "Kruisende wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:73
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:44
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Deze test controleert of er geen knopen met precies dezelfde locatie zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:68
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:130
 msgid "Confirmation"
 msgstr ""
@@ -14271 +14276 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
 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:693
@@ -14417 +14421 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- special display of unreviewed tiger data (USA) -->
 #. <rule>
@@ -14423 +14427 @@
 #. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
-#. 
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -14431 +14435 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Kreis"/>
@@ -14438 +14442 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Gemeinde"/>
@@ -14445 +14449 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="Ort"/>
@@ -14452 +14456 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:type" v="District"/>
@@ -14459 +14463 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="openGeoDB:location" v="locality"/>
@@ -14466 +14470 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--annotation tags -->
-#. 
+#.
 #. <!--"work in progress" tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="building" b="yes"/>
@@ -14513 +14517 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="area" b="yes"/>
@@ -14648 +14652 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:54
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
 msgid "Way Download"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:56
 msgid "Download map data on the end of selected way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:98
 msgid ""
 "<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -14664 +14668 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:106
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:105
 msgid "<html>Could not find a unique node to start downloading from.</html>"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:117
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:167
 #, java-format
 msgid ""
@@ -14680 +14684 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:181
 #, java-format
 msgid ""
@@ -14690 +14694 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:194
 msgid "Merge duplicate node?"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:211
 msgid "<html>No more connected ways to download.</html>"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:220
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
@@ -14854 +14858 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:304
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:369
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:373
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:397
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:401
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:446
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -14974 +14978 @@
 #. 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
 msgid ""
@@ -15014 +15018 @@
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
-msgid "Group common Address Interpolation inputs in a single dialog,"
-msgstr ""
-
-#. Plugin AgPifoJ
+msgid ""
+"Group common Address Interpolation inputs in a single dialog, as well as an "
+"option to automatically generate individual house number nodes from a Way."
+msgstr ""
+
+#. Plugin cadastre-fr
 #: build/trans_plugins.java:5
-msgid ""
-"Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-"import EXIF geotagged pictures."
-msgstr ""
-
-#. Plugin cadastre-fr
+msgid "A special handler for the French land registry WMS server."
+msgstr ""
+
+#. Plugin colorscheme
 #: build/trans_plugins.java:7
-msgid "A special handler for the French land registry WMS server."
-msgstr ""
-
-#. Plugin colorscheme
-#: build/trans_plugins.java:9
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -15040 +15039 @@
 
 #. Plugin Create_grid_of_ways
+#: build/trans_plugins.java:9
+msgid "Create a grid of ways."
+msgstr ""
+
+#. Plugin czechaddress
 #: build/trans_plugins.java:11
-msgid "Create a grid of ways."
-msgstr ""
-
-#. Plugin czechaddress
+msgid ""
+"Creating and handling address nodes and buildings within Czech Republic."
+msgstr ""
+
+#. Plugin dataimport
 #: build/trans_plugins.java:13
-msgid ""
-"Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
-
-#. Plugin dataimport
+msgid "Allows to import various file formats into JOSM directly."
+msgstr ""
+
+#. Plugin DirectUpload
 #: build/trans_plugins.java:15
-msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
-
-#. Plugin DirectUpload
-#: build/trans_plugins.java:17
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -15063 +15062 @@
 
 #. Plugin Duplicate-Way
+#: build/trans_plugins.java:17
+msgid "Duplicate Ways with an offset"
+msgstr ""
+
+#. Plugin editgpx
 #: build/trans_plugins.java:19
-msgid "Duplicate Ways with an offset"
-msgstr ""
-
-#. Plugin editgpx
-#: build/trans_plugins.java:21
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -15075 +15074 @@
 
 #. Plugin globalsat
+#: build/trans_plugins.java:21
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgstr ""
+
+#. Plugin graphview
 #: build/trans_plugins.java:23
-msgid ""
-"Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
-
-#. Plugin graphview
+msgid "Visualizes routing information as a routing graph."
+msgstr ""
+
+#. Plugin grid
 #: build/trans_plugins.java:25
-msgid "Visualizes routing information as a routing graph."
-msgstr ""
-
-#. Plugin grid
+msgid "Provide a background layer that displays a map grid"
+msgstr ""
+
+#. Plugin ImageWayPoint
 #: build/trans_plugins.java:27
-msgid "Provide a background layer that displays a map grid"
-msgstr ""
-
-#. Plugin ImageWayPoint
-#: build/trans_plugins.java:29
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -15099 +15097 @@
 
 #. Plugin lakewalker
+#: build/trans_plugins.java:29
+msgid "Helps vectorizing WMS images."
+msgstr ""
+
+#. Plugin livegps
 #: build/trans_plugins.java:31
-msgid "Helps vectorizing WMS images."
-msgstr ""
-
-#. Plugin livegps
+msgid ""
+"Support live GPS input (moving dot) through a connection to gpsd server."
+msgstr ""
+
+#. Plugin measurement
 #: build/trans_plugins.java:33
-msgid ""
-"Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr ""
-
-#. Plugin measurement
-#: build/trans_plugins.java:35
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -15118 +15116 @@
 
 #. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
+#. Plugin multipoly
 #: build/trans_plugins.java:37
-msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr ""
-
-#. Plugin multipoly
-#: build/trans_plugins.java:39
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -15130 +15128 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:39
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -15138 +15136 @@
 
 #. Plugin openlayers
+#: build/trans_plugins.java:41
+msgid "Displays an OpenLayers background image"
+msgstr ""
+
+#. Plugin openstreetbugs
 #: build/trans_plugins.java:43
-msgid "Displays an OpenLayers background image"
-msgstr ""
-
-#. Plugin openstreetbugs
+msgid "Imports issues from OpenStreetBugs"
+msgstr ""
+
+#. Plugin openvisible
 #: build/trans_plugins.java:45
-msgid "Imports issues from OpenStreetBugs"
-msgstr ""
-
-#. Plugin openvisible
+msgid ""
+"Allows opening gpx/osm files that intersect the currently visible screen area"
+msgstr ""
+
+#. Plugin osmarender
 #: build/trans_plugins.java:47
 msgid ""
-"Allows opening gpx/osm files that intersect the currently visible screen area"
-msgstr ""
-
-#. Plugin osmarender
+"Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr ""
+
+#. Plugin PicLayer
 #: build/trans_plugins.java:49
-msgid ""
-"Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr ""
-
-#. Plugin PicLayer
-#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -15167 +15165 @@
 
 #. Plugin plastic_laf
+#: build/trans_plugins.java:51
+msgid "The great JGoodies Plastic Look and Feel."
+msgstr ""
+
+#. Plugin remotecontrol
 #: build/trans_plugins.java:53
-msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
-
-#. Plugin remotecontrol
+msgid "Let other applications send commands to JOSM."
+msgstr ""
+
+#. Plugin routes
 #: build/trans_plugins.java:55
-msgid "Let other applications send commands to JOSM."
-msgstr ""
-
-#. Plugin routes
-#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -15184 +15182 @@
 
 #. Plugin routing
+#: build/trans_plugins.java:57
+msgid "Provides routing capabilities."
+msgstr ""
+
+#. Plugin slippymap
 #: build/trans_plugins.java:59
-msgid "Provides routing capabilities."
-msgstr ""
-
-#. Plugin slippymap
-#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -15196 +15194 @@
 
 #. Plugin surveyor
+#: build/trans_plugins.java:61
+msgid "Allow adding markers/nodes on current gps positions."
+msgstr ""
+
+#. Plugin tageditor
 #: build/trans_plugins.java:63
-msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
-
-#. Plugin tageditor
+msgid "Provides a dialog for editing tags in a tabular grid."
+msgstr ""
+
+#. Plugin tagging-preset-tester
 #: build/trans_plugins.java:65
-msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
-
-#. Plugin tagging-preset-tester
-#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -15214 +15212 @@
 
 #. Plugin terracer
+#: build/trans_plugins.java:67
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin validator
 #: build/trans_plugins.java:69
-msgid "Make terraced houses out of single blocks."
-msgstr ""
-
-#. Plugin utilsplugin
-#: build/trans_plugins.java:71
-msgid ""
-"Several utilities that make your life easier: e.g. simplify way, join areas, "
-"jump to position."
-msgstr ""
-
-#. Plugin validator
-#: build/trans_plugins.java:73
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -15233 +15224 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:71
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -15240 +15231 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:73
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:75
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -16296 +16287 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--restrictions tags -->
 #. <!--the restrictions rules should be placed before the path rule! -->
-#. 
+#.
 #. <rule>
 #. <condition k="access" b="no"/>
@@ -16494 +16485 @@
 #. color motorroad
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway"/>
@@ -16502 +16493 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
@@ -16519 +16510 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk"/>
@@ -16527 +16518 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
@@ -16544 +16535 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary"/>
@@ -16552 +16543 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
@@ -16569 +16560 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary"/>
@@ -16577 +16568 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
@@ -16590 +16581 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
@@ -16606 +16597 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="residential"/>
@@ -16622 +16613 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="service"/>
@@ -16629 +16620 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--public_transport tags -->
 #. <rule>
@@ -16637 +16628 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="public_transport" v="platform"/>
@@ -16655 +16646 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="passing_place"/>
@@ -16662 +16653 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="construction"/>
@@ -16670 +16661 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="construction"/>
@@ -16718 +16709 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- junction tag -->
-#. 
+#.
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
@@ -17417 +17408 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#. 
+#.
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:932
@@ -17454 +17445 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#. 
+#.
 #. <!-- *** access *** -->
 #: build/trans_presets.java:954
@@ -17548 +17539 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#. 
+#.
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -17703 +17694 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wetland"/>
@@ -19088 +19079 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unclassified"/>
@@ -19096 +19087 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="unsurfaced"/>
@@ -19104 +19095 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="residential"/>
@@ -19112 +19103 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="living_street"/>
@@ -19468 +19459 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--sport tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="9pin"/>
@@ -19478 +19469 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="10pin"/>
@@ -19486 +19477 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="athletics"/>
@@ -19494 +19485 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="australian_football"/>
@@ -19502 +19493 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="baseball"/>
@@ -19510 +19501 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="basketball"/>
@@ -19518 +19509 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="boules"/>
@@ -19526 +19517 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowls"/>
@@ -19534 +19525 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="canoe"/>
@@ -19542 +19533 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="chess"/>
@@ -19550 +19541 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="climbing"/>
@@ -19558 +19549 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket"/>
@@ -19566 +19557 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cricket_nets"/>
@@ -19574 +19565 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="croquet"/>
@@ -19582 +19573 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="cycling"/>
@@ -19590 +19581 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="dog_racing"/>
@@ -19598 +19589 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="equestrian"/>
@@ -19606 +19597 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="football"/>
@@ -19614 +19605 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="golf"/>
@@ -19622 +19613 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="gymnastics"/>
@@ -19630 +19621 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="hockey"/>
@@ -19638 +19629 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="horse_racing"/>
@@ -19646 +19637 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="motor"/>
@@ -19654 +19645 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="multi"/>
@@ -19662 +19653 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="pelota"/>
@@ -19670 +19661 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="racquet"/>
@@ -19678 +19669 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rugby"/>
@@ -19686 +19677 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skating"/>
@@ -19694 +19685 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skateboard"/>
@@ -19702 +19693 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="soccer"/>
@@ -19710 +19701 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="swimming"/>
@@ -19718 +19709 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="skiing"/>
@@ -19726 +19717 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="table_tennis"/>
@@ -19734 +19725 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="tennis"/>
@@ -19742 +19733 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="paintball"/>
@@ -19750 +19741 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="squash"/>
@@ -19758 +19749 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="shooting"/>
@@ -19766 +19757 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="volleyball"/>
@@ -19774 +19765 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="beachvolleyball"/>
@@ -19782 +19773 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="bowling"/>
@@ -19790 +19781 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="handball"/>
@@ -19798 +19789 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="rowing"/>
@@ -19806 +19797 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="sailing"/>
@@ -19814 +19805 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="diving"/>
@@ -19822 +19813 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="badminton"/>
@@ -19830 +19821 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="archery"/>
@@ -19838 +19829 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="sport" v="fishing"/>
@@ -21530 +21521 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--landuse tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farm"/>
@@ -21540 +21531 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmland"/>
@@ -21548 +21539 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="meadow"/>
@@ -21556 +21547 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="vineyard"/>
@@ -21564 +21555 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="allotments"/>
@@ -21572 +21563 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="grass"/>
@@ -21580 +21571 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="village_green"/>
@@ -21588 +21579 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
@@ -22917 +22908 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="bicycle" b="no"/>
@@ -22931 +22922 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cycleway"/>
@@ -22940 +22931 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- cycleway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="lane"/>
@@ -22950 +22941 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
 #. <rule>
 #. <condition k="cycleway" v="track"/>
@@ -22958 +22957 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. <rule>
-#. <condition k="cycleway" v="opposite_lane"/>
-#. color bicycle
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite_track"/>
@@ -22974 +22965 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
@@ -23005 +22996 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="foot" b="no"/>
@@ -23019 +23010 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="footway"/>
@@ -23027 +23018 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="path"/>
@@ -23035 +23026 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="pedestrian"/>
@@ -23044 +23035 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="steps"/>
@@ -23071 +23062 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway"/>
@@ -23184 +23175 @@
 #. 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 rbest 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
@@ -23194 +23185 @@
 #. 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,
@@ -23202 +23193 @@
 #. 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
@@ -23217 +23208 @@
 #. - when the style is additional choose "standard" or don't use name tag
 #. -->
-#. 
+#.
 #: build/trans_style.java:72
 msgid "standard"
@@ -23223 +23214 @@
 
 #. mappaint style named "standard"
-#. 
+#.
 #. <rule>
 #. <condition k="restriction" v="no_left_turn"/>
@@ -23270 +23261 @@
 #. <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>
@@ -23349 +23340 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="road"/>
@@ -23357 +23348 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="direction" v="clockwise"/>
@@ -23364 +23355 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="mini_roundabout"/>
@@ -23372 +23363 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="stop"/>
@@ -23379 +23370 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="traffic_signals"/>
@@ -23386 +23377 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="street_lamp"/>
@@ -23393 +23384 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="speed_camera"/>
@@ -23400 +23391 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="traffic_sign" v="city_limit"/>
@@ -23407 +23398 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="crossing"/>
@@ -23414 +23405 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="gate"/>
@@ -23421 +23412 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="cattle_grid"/>
@@ -23428 +23419 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="toll_booth"/>
@@ -23435 +23426 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline"/>
@@ -23442 +23433 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="incline_steep"/>
@@ -23449 +23440 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="viaduct"/>
@@ -23457 +23448 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="viaduct"/>
@@ -23464 +23455 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <!-- deprecated; use information=guidepost instead -->
@@ -23473 +23464 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="marsh"/>
@@ -23483 +23474 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--abutters tags -->
-#. 
+#.
 #. <!--accessories tags -->
-#. 
+#.
 #. <!--properties tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
@@ -23496 +23487 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--"deprecated" tags -->
-#. 
+#.
 #. <!-- historic=museum -> tourism=museum -->
 #. <rule>
@@ -23507 +23498 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_wind -> power=generator and power_source=wind -->
 #. <rule>
@@ -23516 +23507 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
 #. <rule>
@@ -23525 +23516 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 #. <rule>
@@ -23534 +23525 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
 #. <rule>
@@ -23543 +23534 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway classification now more detailed -->
 #. <rule>
@@ -23552 +23543 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- amenity=park_bench -> amenity=bench -->
 #. <rule>
@@ -23562 +23553 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway=stile -> barrier=stile -->
 #. <rule>
@@ -23571 +23562 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
 #. <rule>
@@ -23594 +23585 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="goods" b="no"/>
@@ -23601 +23592 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="hgv" b="no"/>
@@ -23608 +23599 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="horse" b="no"/>
@@ -23622 +23613 @@
 #. <scale_max>20000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
@@ -23634 +23625 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcycle" b="no"/>
@@ -23641 +23632 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorcar" b="no"/>
@@ -23648 +23639 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="psv" b="no"/>
@@ -23655 +23646 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="motorboat" b="no"/>
@@ -23662 +23653 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boat" b="no"/>
@@ -23669 +23660 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="noexit" b="yes"/>
@@ -23676 +23667 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxweight"/>
@@ -23683 +23674 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxheight"/>
@@ -23690 +23681 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxwidth"/>
@@ -23697 +23688 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxlength"/>
@@ -23704 +23695 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxspeed"/>
@@ -23711 +23702 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="minspeed"/>
@@ -23718 +23709 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="maxstay"/>
@@ -23725 +23716 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="toll"/>
@@ -23732 +23723 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="barrier" v="bollard"/>
@@ -23901 +23892 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- highway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
@@ -23915 +23906 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="track"/>
@@ -23923 +23914 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- tracktype tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade1"/>
@@ -23933 +23924 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade2"/>
@@ -23941 +23932 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade3"/>
@@ -23949 +23940 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade4"/>
@@ -23957 +23948 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
@@ -23971 +23962 @@
 #. <scale_max>10000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_guideway"/>
@@ -23979 +23970 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="rail"/>
@@ -23987 +23978 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="narrow_gauge"/>
@@ -23995 +23986 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="monorail"/>
@@ -24003 +23994 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="turntable"/>
@@ -24011 +24002 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="buffer_stop"/>
@@ -24019 +24010 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="platform"/>
@@ -24036 +24027 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="motorway_junction"/>
@@ -24043 +24034 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="services"/>
@@ -24055 +24046 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="ford"/>
@@ -24067 +24058 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="bus_stop"/>
@@ -24074 +24065 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
@@ -24086 +24077 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
@@ -24099 +24090 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="riverbank"/>
@@ -24112 +24103 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="stream"/>
@@ -24124 +24115 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dock"/>
@@ -24136 +24127 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="lock_gate"/>
@@ -24143 +24134 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="turning_point"/>
@@ -24150 +24141 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
@@ -24162 +24153 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="boatyard"/>
@@ -24170 +24161 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="water_point"/>
@@ -24177 +24168 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waste_disposal"/>
@@ -24184 +24175 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="mooring"/>
@@ -24191 +24182 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="weir"/>
@@ -24199 +24190 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="dam"/>
@@ -24208 +24199 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="waterway" v="waterfall"/>
@@ -24216 +24207 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--man_made tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="beacon"/>
@@ -24226 +24217 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="crane"/>
@@ -24234 +24225 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="gasometer"/>
@@ -24242 +24233 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="lighthouse"/>
@@ -24251 +24242 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
@@ -24259 +24250 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="surveillance"/>
@@ -24267 +24258 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="survey_point"/>
@@ -24275 +24266 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="tower"/>
@@ -24283 +24274 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="wastewater_plant"/>
@@ -24291 +24282 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
@@ -24299 +24290 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="water_tower"/>
@@ -24307 +24298 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="windmill"/>
@@ -24315 +24306 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="works"/>
@@ -24336 +24327 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- railway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="station"/>
@@ -24346 +24337 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="halt"/>
@@ -24353 +24344 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_station"/>
@@ -24361 +24352 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram_stop"/>
@@ -24368 +24359 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
@@ -24376 +24367 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="crossing"/>
@@ -24384 +24375 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
@@ -24398 +24389 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="tram"/>
@@ -24407 +24398 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
@@ -24424 +24415 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="railway" v="preserved"/>
@@ -24432 +24423 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- disused often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24443 +24434 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- abandoned often appears together with highway=xy -->
 #. <!-- -> normal display with line, linemod for combinations -->
@@ -24459 +24450 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="yard"/>
@@ -24466 +24457 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="siding"/>
@@ -24473 +24464 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="service" v="spur"/>
@@ -24480 +24471 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aeroway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="aerodrome"/>
@@ -24491 +24482 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
@@ -24504 +24495 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
@@ -24516 +24507 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="helipad"/>
@@ -24524 +24515 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
@@ -24536 +24527 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
@@ -24548 +24539 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aeroway" v="windsock"/>
@@ -24555 +24546 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--aerialway tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="cable_car"/>
@@ -24565 +24556 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="gondola"/>
@@ -24573 +24564 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
@@ -24581 +24572 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="drag_lift"/>
@@ -24589 +24580 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="aerialway" v="station"/>
@@ -24603 +24594 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- piste tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
@@ -24618 +24609 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
@@ -24631 +24622 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
@@ -24644 +24635 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="expert"/>
@@ -24657 +24648 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
@@ -24670 +24661 @@
 #. <scale_max>30000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
@@ -24683 +24674 @@
 #. <scale_max>300000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--power tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="tower"/>
@@ -24693 +24684 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="pole"/>
@@ -24700 +24691 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="line"/>
@@ -24708 +24699 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="minor_line"/>
@@ -24716 +24707 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="station"/>
@@ -24724 +24715 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="sub_station"/>
@@ -24732 +24723 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="wind"/>
@@ -24740 +24731 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="hydro"/>
@@ -24748 +24739 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="fossil"/>
@@ -24756 +24747 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="coal"/>
@@ -24764 +24755 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="gas"/>
@@ -24772 +24763 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="photovoltaic"/>
@@ -24780 +24771 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power_source" v="nuclear"/>
@@ -24788 +24779 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="power" v="generator"/>
@@ -24806 +24797 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pier"/>
@@ -24819 +24810 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
@@ -24830 +24821 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--leisure tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="sports_centre"/>
@@ -24840 +24831 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="golf_course"/>
@@ -24848 +24839 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="stadium"/>
@@ -24856 +24847 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="track"/>
@@ -24864 +24855 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="pitch"/>
@@ -24872 +24863 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="water_park"/>
@@ -24880 +24871 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="slipway"/>
@@ -24888 +24879 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="fishing"/>
@@ -24896 +24887 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="nature_reserve"/>
@@ -24904 +24895 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="park"/>
@@ -24912 +24903 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="playground"/>
@@ -24920 +24911 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="garden"/>
@@ -24928 +24919 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="common"/>
@@ -24936 +24927 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="swimming_pool"/>
@@ -24944 +24935 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="miniature_golf"/>
@@ -24963 +24954 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="leisure" v="marina"/>
@@ -24975 +24966 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--amenity tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pub"/>
@@ -24985 +24976 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="biergarten"/>
@@ -24993 +24984 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nightclub"/>
@@ -25001 +24992 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cafe"/>
@@ -25009 +25000 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="restaurant"/>
@@ -25017 +25008 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fast_food"/>
@@ -25025 +25016 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bar"/>
@@ -25033 +25024 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ice_cream"/>
@@ -25048 +25039 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="multi-storey"/>
@@ -25056 +25047 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="underground"/>
@@ -25064 +25055 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="park_and_ride"/>
@@ -25072 +25063 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="parking" v="surface"/>
@@ -25080 +25071 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="parking"/>
@@ -25088 +25079 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_parking"/>
@@ -25096 +25087 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
@@ -25104 +25095 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_rental"/>
@@ -25112 +25103 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_sharing"/>
@@ -25120 +25111 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="car_wash"/>
@@ -25128 +25119 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="taxi"/>
@@ -25136 +25127 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
@@ -25153 +25144 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="telephone"/>
@@ -25161 +25152 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="clock"/>
@@ -25168 +25159 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
@@ -25176 +25167 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="toilets"/>
@@ -25184 +25175 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="recycling"/>
@@ -25192 +25183 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="waste_basket"/>
@@ -25199 +25190 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="public_building"/>
@@ -25207 +25198 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="embassy"/>
@@ -25215 +25206 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="townhall"/>
@@ -25223 +25214 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="community_centre"/>
@@ -25231 +25222 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="bahai"/>
@@ -25238 +25229 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="buddhist"/>
@@ -25245 +25236 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="christian"/>
@@ -25252 +25243 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="hindu"/>
@@ -25259 +25250 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jain"/>
@@ -25266 +25257 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="jewish"/>
@@ -25273 +25264 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="muslim"/>
@@ -25280 +25271 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="sikh"/>
@@ -25287 +25278 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="shinto"/>
@@ -25294 +25285 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="spiritualist"/>
@@ -25301 +25292 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="taoist"/>
@@ -25308 +25299 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="unitarian"/>
@@ -25315 +25306 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="religion" v="zoroastrian"/>
@@ -25322 +25313 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="place_of_worship"/>
@@ -25330 +25321 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="grave_yard"/>
@@ -25338 +25329 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="crematorium"/>
@@ -25346 +25337 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_office"/>
@@ -25354 +25345 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="post_box"/>
@@ -25362 +25353 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="school"/>
@@ -25370 +25361 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="university"/>
@@ -25378 +25369 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="college"/>
@@ -25386 +25377 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="kindergarten"/>
@@ -25394 +25385 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
@@ -25403 +25394 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="library"/>
@@ -25411 +25402 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="police"/>
@@ -25419 +25410 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fire_station"/>
@@ -25427 +25418 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bus_station"/>
@@ -25435 +25426 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
@@ -25443 +25434 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="theatre"/>
@@ -25451 +25442 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="cinema"/>
@@ -25459 +25450 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="arts_centre"/>
@@ -25467 +25458 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="courthouse"/>
@@ -25475 +25466 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="prison"/>
@@ -25483 +25474 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bank"/>
@@ -25491 +25482 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bureau_de_change"/>
@@ -25499 +25490 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="atm"/>
@@ -25507 +25498 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bench"/>
@@ -25515 +25506 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="bbq"/>
@@ -25523 +25514 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="shelter"/>
@@ -25531 +25522 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hunting_stand"/>
@@ -25539 +25530 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="wlan"/>
@@ -25547 +25538 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="vending" v="excrement_bags"/>
@@ -25554 +25545 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="vending_machine"/>
@@ -25584 +25575 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="drinking_water"/>
@@ -25592 +25583 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="fountain"/>
@@ -25600 +25591 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--natural tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="spring"/>
@@ -25615 +25606 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="pharmacy"/>
@@ -25623 +25614 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="hospital"/>
@@ -25631 +25622 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="nursery"/>
@@ -25639 +25630 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="baby_hatch"/>
@@ -25647 +25638 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="doctors"/>
@@ -25655 +25646 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="dentist"/>
@@ -25663 +25654 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
@@ -25677 +25668 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--shop tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="supermarket"/>
@@ -25687 +25678 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="convenience"/>
@@ -25695 +25686 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bakery"/>
@@ -25703 +25694 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="butcher"/>
@@ -25711 +25702 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="bicycle"/>
@@ -25719 +25710 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="doityourself"/>
@@ -25727 +25718 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="dry_cleaning"/>
@@ -25735 +25726 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="laundry"/>
@@ -25743 +25734 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="outdoor"/>
@@ -25751 +25742 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="kiosk"/>
@@ -25759 +25750 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="alcohol"/>
@@ -25767 +25758 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="beverages"/>
@@ -25775 +25766 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="books"/>
@@ -25783 +25774 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car"/>
@@ -25791 +25782 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_dealer"/>
@@ -25799 +25790 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
@@ -25807 +25798 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="chemist"/>
@@ -25815 +25806 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="clothes"/>
@@ -25823 +25814 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="computer"/>
@@ -25831 +25822 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="cycle_repair"/>
@@ -25839 +25830 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="department_store"/>
@@ -25847 +25838 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="electronics"/>
@@ -25855 +25846 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="furniture"/>
@@ -25863 +25854 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="florist"/>
@@ -25871 +25862 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="groceries"/>
@@ -25879 +25870 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="garden_centre"/>
@@ -25887 +25878 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hairdresser"/>
@@ -25895 +25886 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hardware"/>
@@ -25903 +25894 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="hifi"/>
@@ -25911 +25902 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="jewelry"/>
@@ -25919 +25910 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="mall"/>
@@ -25927 +25918 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="motorcycle"/>
@@ -25935 +25926 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="newsagent"/>
@@ -25943 +25934 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="organic"/>
@@ -25951 +25942 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="optician"/>
@@ -25959 +25950 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="shoes"/>
@@ -25967 +25958 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="sports"/>
@@ -25975 +25966 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="stationery"/>
@@ -25983 +25974 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="tailor"/>
@@ -25991 +25982 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="travel_agency"/>
@@ -25999 +25990 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="toys"/>
@@ -26007 +25998 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="shop" v="video"/>
@@ -26015 +26006 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- duplicate of shopping_centre? -->
 #. <rule>
@@ -26049 +26040 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--tourism tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hotel"/>
@@ -26059 +26050 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="motel"/>
@@ -26067 +26058 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="guest_house"/>
@@ -26075 +26066 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="hostel"/>
@@ -26083 +26074 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="chalet"/>
@@ -26091 +26082 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
@@ -26099 +26090 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="camp_site"/>
@@ -26107 +26098 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="caravan_site"/>
@@ -26122 +26113 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="picnic_site"/>
@@ -26130 +26121 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="viewpoint"/>
@@ -26138 +26129 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="theme_park"/>
@@ -26146 +26137 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="attraction"/>
@@ -26154 +26145 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="zoo"/>
@@ -26162 +26153 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="artwork"/>
@@ -26171 +26162 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="museum"/>
@@ -26179 +26170 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!-- information tags -->
 #. <rule>
@@ -26187 +26178 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="office"/>
@@ -26195 +26186 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="map"/>
@@ -26202 +26193 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="information" v="board"/>
@@ -26209 +26200 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="tourism" v="information"/>
@@ -26225 +26216 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--historic tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="castle"/>
@@ -26235 +26226 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="monument"/>
@@ -26243 +26234 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="memorial"/>
@@ -26251 +26242 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="archaeological_site"/>
@@ -26259 +26250 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="ruins"/>
@@ -26267 +26258 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="battlefield"/>
@@ -26275 +26266 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="geological" v="palaeontological_site"/>
@@ -26283 +26274 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_cross"/>
@@ -26291 +26282 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="wayside_shrine"/>
@@ -26299 +26290 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="historic" v="boundary_stone"/>
@@ -26316 +26307 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
@@ -26328 +26319 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
@@ -26340 +26331 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="basin"/>
@@ -26348 +26339 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
@@ -26360 +26351 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="forest"/>
@@ -26372 +26363 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
@@ -26384 +26375 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
-#. 
+#.
+#.
 #. <rule>
 #. <condition k="landuse" v="retail"/>
@@ -26393 +26384 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
@@ -26405 +26396 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
@@ -26417 +26408 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
@@ -26429 +26420 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
@@ -26441 +26432 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="railway"/>
@@ -26453 +26444 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="military"/>
@@ -26461 +26452 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--military tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="airfield"/>
@@ -26471 +26462 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="bunker"/>
@@ -26479 +26470 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="barracks"/>
@@ -26487 +26478 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="danger_area"/>
@@ -26495 +26486 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="military" v="range"/>
@@ -26510 +26501 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
@@ -26521 +26512 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="peak"/>
@@ -26533 +26524 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="glacier"/>
@@ -26545 +26536 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="volcano"/>
@@ -26557 +26548 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cliff"/>
@@ -26566 +26557 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scree"/>
@@ -26574 +26565 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="fell"/>
@@ -26582 +26573 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="bay"/>
@@ -26590 +26581 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="land"/>
@@ -26598 +26589 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
@@ -26613 +26604 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="scrub"/>
@@ -26625 +26616 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="heath"/>
@@ -26637 +26628 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="wood"/>
@@ -26649 +26640 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="mud"/>
@@ -26661 +26652 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="beach"/>
@@ -26673 +26664 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="natural" v="tree"/>
@@ -26680 +26671 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--route tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="bus"/>
@@ -26690 +26681 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ferry"/>
@@ -26698 +26689 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="flight"/>
@@ -26706 +26697 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ncn"/>
@@ -26714 +26705 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="subsea"/>
@@ -26722 +26713 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="ski"/>
@@ -26730 +26721 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="tour"/>
@@ -26738 +26729 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
@@ -26753 +26744 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <!--boundary tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national"/>
@@ -26763 +26754 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="administrative"/>
@@ -26771 +26762 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="civil"/>
@@ -26779 +26770 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="political"/>
@@ -26787 +26778 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
@@ -26801 +26792 @@
 #. <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?
@@ -26825 +26816 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="surface" v="cobblestone"/>
@@ -26834 +26825 @@
 #. </rule>
 #. -->
-#. 
+#.
 #. <!--name tags -->
-#. 
+#.
 #. <!--preferences tags -->
-#. 
+#.
 #. <!--place tags -->
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="continent"/>
@@ -26848 +26839 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="country"/>
@@ -26856 +26847 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="state"/>
@@ -26864 +26855 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="region"/>
@@ -26872 +26863 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="county"/>
@@ -26880 +26871 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="city"/>
@@ -26888 +26879 @@
 #. <scale_max>200000000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="town"/>
@@ -26896 +26887 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="village"/>
@@ -26904 +26895 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="hamlet"/>
@@ -26912 +26903 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="suburb"/>
@@ -26920 +26911 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="locality"/>
@@ -26928 +26919 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="island"/>
@@ -26936 +26927 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="place" v="islet"/>
@@ -26954 +26945 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:housenumber"/>
@@ -26961 +26952 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:postcode"/>
@@ -26968 +26959 @@
 #. <scale_max>50000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="odd"/>
@@ -26975 +26966 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="even"/>
@@ -26982 +26973 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
@@ -26989 +26980 @@
 #. <scale_max>40000</scale_max>
 #. </rule>
-#. 
+#.
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
@@ -27082 +27073 @@
 #. Each line specifies a certain error to be reported
 #. <data type> : messagetype : <key><expression><value>
-#. 
+#.
 #. Data type can be:
 #. node        - a node point
@@ -27088 +27079 @@
 #. 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
@@ -27224 +27215 @@
 #. default(true or false);Name;URL
 #. NOTE: default items should be common and worldwide
-#. 
+#.
 #: build/trans_wms.java:5
 msgid "Landsat"
@@ -27235 +27226 @@
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
-#. 
+#.
 #. different forms for web access
 #. must be html:<url>
@@ -27258 +27249 @@
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
-#. 
-#. 
+#.
+#.
 #. only for Germany
 #: build/trans_wms.java:17
@@ -27266 +27257 @@
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
-#. 
-#. 
+#.
+#.
 #. only for North America
 #. Terraserver USCG - High resolution maps
@@ -27280 +27271 @@
 
 #. 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
@@ -27293 +27284 @@
 
 #. 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
@@ -27312 +27303 @@
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
-#. 
-#. 
+#.
+#.
 #. only for Japan
 #: build/trans_wms.java:39
@@ -27335 +27326 @@
 
 #. 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
@@ -27347 +27338 @@
 msgstr ""
 
+#~ msgid "Images for {0}"
+#~ msgstr "Afbeeldingen van {0}"
+
+#~ msgid "Read GPX..."
+#~ msgstr "GPX inlezen..."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Geen tijd voor punt {0} x {1}"
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "GPS-start: {0}"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "GPS-einde: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "Huidige verschil: {0}s"
+
+#~ msgid "timezone difference: "
+#~ msgstr "Tijdzoneverschil: "
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} binnen de track."
+
+#~ msgid "Sync clock"
+#~ msgstr "Klok synchroniseren"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
+
+#~ msgid "Image"
+#~ msgstr "Afbeelding"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
+
+#~ msgid "Synchronize Time with GPS Unit"
+#~ msgstr "Syncroniseer tijd met GPS-apparaat"
+
+#~ msgid "Time entered could not be parsed."
+#~ msgstr "Ingevoerde tijd kon niet worden ontleed."
+
+#~ msgid "AgPifoJ - Geotagged pictures"
+#~ msgstr "AgPifoJ - Geotagged-afbeeldingen"
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Afbeeldingen openen met AGPifoJ..."
+
+#~ msgid "osmarender options"
+#~ msgstr "osmarender-optie"
+
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecteer eerst een bladwijzer."
@@ -27383 +27437 @@
 #~ msgstr "Openen in browser"
 
-#, java-format
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Maak een melding bij {0}"
@@ -27389 +27442 @@
 #~ 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:"
@@ -27405 +27459 @@
 #~ "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 "Found <nd> element in non-way."
@@ -27423 +27477 @@
 #~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
 
-#, java-format
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "Plugin vereist JOSM-update: {0}"
@@ -27431 +27484 @@
 #~ "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"
 #~ msgstr "Niet-opgeslagen wijzigingen"
 
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Voer eerst de gewenste coördinaten in."
-
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Met OSM-server verbinden..."
@@ -27482 +27533 @@
 
 #~ 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 "
@@ -27494 +27545 @@
 #~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
 
-#, java-format
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}"
-
 #~ msgid "Plugin already exists"
 #~ msgstr "Plugin bestaat al"
 
-#, java-format
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Kan plugin niet downloaden: {0} van {1}"
@@ -27508 +27554 @@
 #~ msgstr "Bestand niet gevonden"
 
-#, java-format
-#~ msgid "Delete {1} {0}"
-#~ msgstr "{1} {0} verwijderen"
-
 #~ msgid "Conflicting relation"
 #~ msgstr "Conflicterende relatie"
@@ -27525 +27567 @@
 
 #~ 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 "
@@ -27532 +27574 @@
 
 #~ 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?"
@@ -27550 +27592 @@
 #~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken."
 
-#, 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"
@@ -27573 +27614 @@
 #~ msgstr "Naar OSM uploaden..."
 
-#, java-format
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -27580 +27620 @@
 #~ "{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}"
@@ -27609 +27649 @@
 #~ msgstr "Afbeeldings-id Metacarta Map Rectifier"
 
-#, java-format
 #~ msgid "rectifier id={0}"
 #~ msgstr "rectifier-id={0}"
@@ -27618 +27657 @@
 
 #~ 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 "
@@ -27634 +27673 @@
 #~ "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"
@@ -27642 +27681 @@
 #~ "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"
@@ -27658 +27697 @@
 #~ "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."
 
 #~ msgid "OSM username (email)"
@@ -27672 +27711 @@
 #~ msgid ""
 #~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded in "
-#~ "the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
 #~ msgstr ""
 #~ "<html>WAARSCHUWING: het wachtwoord wordt als gewone tekst in het "
@@ -27711 +27750 @@
 #~ "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}"
 
-#, java-format
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflicten: {0}"
@@ -27730 +27766 @@
 #~ "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."
@@ -27739 +27776 @@
 #~ msgstr "Bronnen tagvoorkeuzen"
 
-#, java-format
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan voorkeurenmap niet openen: {0}"
@@ -27789 +27825 @@
 #~ msgstr "onwaar"
 
-#, java-format
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Los {0} conflicten in {1} objecten op"
 
 #~ 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?"
@@ -27827 +27862 @@
 #~ 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"
@@ -27845 +27877 @@
 #~ msgstr "Loginnaam (e-mail) van het OSM-account."
 
-#, java-format
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -27860 +27891 @@
 #~ msgstr "samengevoegde versie:"
 
-#, java-format
 #~ msgid "requested: {0}"
 #~ msgstr "verzocht: {0}"
@@ -27906 +27936 @@
 #~ msgstr "bord"
 
-#, 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"
@@ -27953 +27982 @@
 
 #~ 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.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."
+#~ "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."
 #~ 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.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."
+#~ "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."
 
 #~ msgid "sports"
@@ -27984 +28011 @@
 #~ msgstr "Omlaag bewegen"
 
-#, java-format
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relatie-editor: {0}"
@@ -28007 +28033 @@
 #~ 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}."
@@ -28035 +28060 @@
 
 #~ 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 "
@@ -28042 +28067 @@
 
 #~ 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 "Edit Drawbridge"
@@ -28053 +28079 @@
 #~ msgstr "Valhek bewerken"
 
-#, java-format
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"