Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 18508)
+++ applications/editors/josm/i18n/po/nl.po	(revision 18656)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-08 14:27+0100\n"
-"PO-Revision-Date: 2009-10-25 13:43+0000\n"
+"POT-Creation-Date: 2009-11-17 17:14+0100\n"
+"PO-Revision-Date: 2009-11-08 14:13+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
+"X-Launchpad-Export-Date: 2009-11-17 16:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -47,18 +47,18 @@
 #: ../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:165
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:164
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
@@ -68,6 +68,5 @@
 #: ../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:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
@@ -75,11 +74,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
@@ -94,4 +93,5 @@
 #: ../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/wmsplugin/src/wmsplugin/WMSGrabber.java:137
 msgid "Warning"
@@ -118,6 +118,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
+#: ../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
@@ -133,7 +133,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
@@ -144,7 +144,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
@@ -170,12 +170,12 @@
 #: ../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:240
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39
+#: ../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/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -187,6 +187,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "Error"
 msgstr "Fout"
@@ -207,6 +208,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
@@ -318,5 +319,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../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
@@ -334,6 +335,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
@@ -344,5 +345,5 @@
 #: ../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:577
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -462,5 +463,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -502,5 +503,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
@@ -509,6 +510,7 @@
 #: ../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:657
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
+#: ../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/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
 msgid "Information"
@@ -696,5 +698,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
@@ -707,5 +709,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:97
 msgid "Delete"
@@ -777,5 +779,13 @@
 #: ../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:55
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882
+#: ../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/history/CoordinateInfoViewer.java:95
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
 #, java-format
@@ -783,28 +793,28 @@
 msgstr "Parameter ''{0}'' mag niet null zijn"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
+#: ../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:483
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Er waren {0} tegenstrijdigheden tijdens het importeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:258
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
@@ -841,10 +851,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288
 msgid "Export to GPX..."
 msgstr "Exporteren naar GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export the data to GPX file."
 msgstr "De gegevens naar een GPX-bestand exporteren."
@@ -857,11 +867,10 @@
 #: ../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:203
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
-#: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
+#: ../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
@@ -892,5 +901,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:314
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
@@ -905,17 +913,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:145
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:157
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:169
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:243
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:97
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:111
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:126
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:143
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:121
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:123
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
@@ -975,5 +984,5 @@
 msgstr "Koppel een knoop met het dichtstbijzijnde wegsegment"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
 msgstr "Knoop en lijn koppelen"
@@ -1004,22 +1013,19 @@
 msgstr "Minstens twee knopen selecteren om samen te voegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:152
 msgid "Abort Merging"
-msgstr "Afbreken..."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154
 msgid "Click to abort merging nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#, java-format
 msgid ""
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
-"Kan knopen niet samenvoegen: zou daarvoor een weg moeten verwijderen die nog "
-"in gebruik is."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:264
 #, java-format
 msgid "Merge {0} nodes"
@@ -1160,7 +1166,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
-#, fuzzy
 msgid "Download Data"
-msgstr "Gegevens worden gedownload"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
@@ -1307,10 +1312,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258
 msgid "Save"
 msgstr "Opslaan"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
 msgid "Save the current data."
 msgstr "Huidige gegevens opslaan."
@@ -1367,10 +1372,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273
 msgid "Save As..."
 msgstr "Opslaan als..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save the current data to a new file."
 msgstr "De huidige gegevens in een nieuw bestand opslaan."
@@ -1413,25 +1418,25 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Weg splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Een weg bij de geselecteerde knoop splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
 msgid "The current selection cannot be used for splitting."
 msgstr "De huidige selectie kan niet gebruik worden voor splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1439,5 +1444,5 @@
 msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1453,9 +1458,9 @@
 "heeft, Selecteer ook de weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
 msgid "The selected nodes do not share the same way."
 msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1463,11 +1468,11 @@
 msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1477,5 +1482,5 @@
 "selecteer knopen in het midden van de weg.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1483,5 +1488,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1491,5 +1496,5 @@
 "<br>Controleer dit en corrigeer dit waar nodig.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1519,38 +1524,38 @@
 msgstr "Dubbele knopen die door meerdere wegen worden gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:81
 msgid "This node is not glued to anything else."
 msgstr "De knoop is met niets anders verbonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
 msgid "None of these nodes are glued to anything else."
 msgstr "Geen van deze knopen is met iets anders verbonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Geen van deze wegknopen is met iets anders verbonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "The current selection cannot be used for unglueing."
 msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "Select either:"
 msgstr "Selecteer één van beide:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One tagged node, or"
 msgstr "* Een getagde knoop, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid "* One node that is used by more than one way, or"
 msgstr "* een knoop die gebruikt is door meer dan een weg, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../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"
 msgstr ""
 "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1559,5 +1564,5 @@
 "weg, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1566,5 +1571,5 @@
 "één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1578,9 +1583,9 @@
 "geselecteerd worden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
 msgid "Unglued Node"
 msgstr "Ongebonden knoop"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1588,5 +1593,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1627,12 +1632,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
-#, fuzzy
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Update de objecten in de huidige data laag van de server."
+msgstr ""
 
 #. bounds defined? => use the bbox downloader
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944
 msgid "Download data"
 msgstr ""
@@ -1648,5 +1652,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Update selections"
+#, fuzzy
+msgid "Update selection"
 msgstr "Selectie updaten"
 
@@ -1661,10 +1666,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
-msgid "There are no selected primitives to update."
-msgstr ""
+#, fuzzy
+msgid "There are no selected objects to update."
+msgstr "Geselecteerde objecten naar klembord kopiëren"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selectie leeg"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147
+#, fuzzy
+msgid "Update objects"
+msgstr "Selectie updaten"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
@@ -1674,7 +1685,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-#, fuzzy
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr "Upload alle veranderingen in de huidige data laag naar de OSM server"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
@@ -1812,7 +1822,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} objects ..."
-msgstr "{0} object wijzigen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
@@ -1934,9 +1944,9 @@
 msgstr "Gedownloade GPX-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80
 msgid "Downloading data"
 msgstr "Gegevens worden gedownload"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92
 #, java-format
 msgid ""
@@ -1944,5 +1954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139
 msgid "No data found in this area."
 msgstr "Geen data in dit gebied gevonden."
@@ -1958,7 +1968,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
-#, fuzzy
 msgid "Check on the server"
-msgstr "Naam van gebruiker."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2002,7 +2011,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
-#, fuzzy
 msgid "Errors during download"
-msgstr "Fouten tijdens download"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2016,5 +2024,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -2047,6 +2055,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 msgid "selected"
 msgstr "geselecteerd"
@@ -2064,26 +2072,26 @@
 msgstr "Knoop in weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:546
 msgid "Connect existing way to node"
 msgstr "Bestaande weg aan knoop koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:548
 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:551
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:550
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:944
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:968
 msgid "Select node under cursor."
 msgstr "Selecteer de node onder de cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:946
 #, java-format
 msgid "Insert new node into way."
@@ -2092,48 +2100,48 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:956
 msgid "Start new way from last node."
 msgstr "Start een nieuwe weg vanaf de node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:958
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:981
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
 msgid "Extrude"
 msgstr "Uittrekken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
 msgid "Create areas"
 msgstr "Gebieden aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
 msgid "Extrude Way"
 msgstr "Weg uittrekken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
-msgid "Draw a rectangle of the desired size, then release the mouse button."
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#, fuzzy
+msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 "Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop "
 "loslaten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
-msgid "Release the mouse button to stop rotating."
-msgstr "De muisknop loslaten om het roteren te stoppen."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
-msgid "Drag a way segment to make a rectangle."
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr ""
+"Een rechthoek met de gewenste grootte tekenen, vervolgens de muisknop "
+"loslaten."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#, fuzzy
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
 msgstr "Een wegsegment verslepen om een rechthoek te maken."
 
@@ -2190,4 +2198,8 @@
 msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
@@ -2196,4 +2208,8 @@
 "De muisknop loslaten om het verplaatsen te stoppen. CTRL om samen te voegen "
 "met dichtstbijzijnde knoop."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
+msgid "Release the mouse button to stop rotating."
+msgstr "De muisknop loslaten om het roteren te stoppen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
@@ -2223,67 +2239,70 @@
 "omlaag, rechts; verplaats met rechter knop"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
-msgid "Can't search because there is no loaded data."
-msgstr "Kan niet zoeken omdat er geen data geladen is"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#. -- prepare the combo box with the search expressions
+#.
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
 msgid "Please enter a filter string."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
 msgid "Please enter a search string."
 msgstr "Voer een zoekopdracht in:"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
+#, fuzzy
+msgid "Enter the search expression"
+msgstr "Reguliere expressie"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
 msgid "replace selection"
 msgstr "Selectie vervangen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
 msgid "add to selection"
 msgstr "Toevoegen aan selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
 msgid "remove from selection"
 msgstr "Verwijderen uit selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
 msgid "find in selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid "case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "regular expression"
 msgstr "Reguliere expressie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Lange straat</b> - 'Lange' en 'straat' in een sleutel of naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Lange straat\"</b> - 'Lange' en 'straat' in een sleutel of naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Lange</b> - 'Lang' ergens in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - sleutel 'type' met exacte waarde 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2293,80 +2312,79 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Lange</b> - geen 'Lang' in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - sleutel=foot, met een willekeurige waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciale zoekopdrachten:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - objecttype (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>gebruiker:</b>... - alle objecten veranderd door gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../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:113
+#: ../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:114
-#, fuzzy
+#: ../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-"
 "max)"
-msgstr "<b>nodes:</b>... - object met opgegeven aantal knopen"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgstr ""
+
+#: ../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:116
+#: ../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:117
+#: ../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:118
+#: ../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:119
+#: ../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:120
+#: ../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:121
+#: ../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:122
+#: ../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:123
+#: ../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:133
+#: ../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
@@ -2376,51 +2394,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../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:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../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:253
+#: ../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:255
+#: ../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:257
+#: ../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:259
+#: ../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:269
+#: ../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:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
 msgid "RX"
 msgstr "RX"
@@ -2594,6 +2612,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../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/grid/src/grid/GridLayer.java:162
@@ -2718,5 +2736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:214
 #, java-format
 msgid ""
@@ -2737,9 +2755,12 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
-#, fuzzy, java-format
+#, java-format
 msgid "Parameter ''{0}'' must not be empty"
-msgstr "Parameter ''{0}'' mag niet null zijn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+msgid "At least one object to delete required, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
 msgid "At least one object to delete requird, got empty collection"
@@ -2775,5 +2796,5 @@
 
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:430
 msgid "Split way segment"
 msgstr "Wegsegment splitsen"
@@ -2781,6 +2802,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:454
+#: ../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."
@@ -2792,5 +2813,5 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:462
 msgid "Delete confirmation"
 msgstr ""
@@ -2801,5 +2822,15 @@
 msgstr "Conflicten in verwijderde toestand oplossen in {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
+#. in case #3892 happens again
+#.
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97
+msgid "null detected in node list"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98
+msgid "unexpected null value for n.getEastNorth(). id of n is"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
 #, java-format
 msgid "Move {0} node"
@@ -2881,5 +2912,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62
 #, java-format
 msgid "Undelete {0} primitives"
@@ -2987,8 +3018,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:68
+#, java-format
+msgid "Illegal double value ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:101
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:103
 #, fuzzy, java-format
-msgid "Illegal double value ''{0}''"
-msgstr "Standaardwaarde is ''{0}''."
+msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+msgstr "Parameter ''{0}'' mag niet null zijn"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
@@ -3168,5 +3205,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3180,5 +3217,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634
 #, java-format
 msgid ""
@@ -3186,4 +3223,40 @@
 "Please report this  at http://josm.openstreetmap.de . This is not a critical "
 "error, it should be safe to continue in your work."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191
+#, java-format
+msgid "Missing merge target for way with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175
+#, java-format
+msgid "Missing merge target for object with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203
+#, fuzzy, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr "Ontbrekend argument voor NOT."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
+#, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224
+#, java-format
+msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. should not happen
+#.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256
+#, java-format
+msgid ""
+"Target object with id {0} and version {1} is visible although source object "
+"with lower version {2} is not visible. Can''t deal with this inconsistency. "
+"Keeping target object. "
 msgstr ""
 
@@ -3241,32 +3314,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Error: {0}"
-msgstr "Fout: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:108
-#, java-format
-msgid "Warning: {0}"
-msgstr "Waarschuwing: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396
 #, java-format
 msgid "Version > 0 expected. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884
+msgid ""
+"Can''t merge because either of the participating primitives is new and the "
+"other is not"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886
+#, java-format
+msgid ""
+"Can''t merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
 
@@ -3291,45 +3365,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
+#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58
+msgid "User with the same uid but different name found"
+msgstr ""
+
+#: ../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}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
-msgid "There's no primitive with version {0} in this history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:165
-msgid "There's no version valid at date ''{0}'' in this history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:176
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' > 0 expected, got {1}"
+msgstr "Parameter ''{0}'' mag niet null zijn"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218
 #, java-format
 msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
-msgid "No earliest version found. History is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
-msgid "No latest version found. History is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
-msgid "No type found. History is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84
-msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../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
@@ -3340,6 +3397,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:105
-msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+#: ../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}''."
 msgstr ""
 
@@ -3350,145 +3408,145 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:243
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:476
 #, 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:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:919
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
 #, 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:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636
 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:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 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:688
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:667
 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:692
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:671
 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:815
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:794
 #, 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:909
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:888
 #, 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:921
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:900
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Binnenweg \"{0}\" is uitwendig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935
 #, 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:970
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Niet-weg \"{0}\" in multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:991
 #, 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:1083
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
 #, 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:1113
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081
 #, 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:1421
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1389
 msgid "untagged"
 msgstr "niet-getagd"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1422
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1390
 msgid "text"
 msgstr "tekst"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1391
 msgid "areatext"
 msgstr ""
 
-#. should not happen
-#.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
-#, java-format
-msgid ""
-"My primitive with id {0} and version {1} is visible although their primitive "
-"with lower version {2} is not visible. Can't deal with this inconsistency. "
-"Keeping my primitive. "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Error: {0}"
+msgstr "Fout: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641
+#, java-format
+msgid "Warning: {0}"
+msgstr "Waarschuwing: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 msgid "inactive"
 msgstr "inactief"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3498,5 +3556,5 @@
 msgstr[1] "knopen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3506,6 +3564,6 @@
 msgstr[1] "wegen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3515,13 +3573,13 @@
 msgstr[1] "relaties"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
 msgid "untagged way"
 msgstr "ongetagde weg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 msgid "incomplete way"
 msgstr "incomplete weg"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
@@ -3529,5 +3587,5 @@
 msgstr "achtergrond"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104
 msgid "highlight"
 msgstr "markeren"
@@ -3612,5 +3670,5 @@
 msgstr "Niet meer tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3618,32 +3676,32 @@
 msgstr " [id: {0}]"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
 msgid "highway"
 msgstr "snelweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 #: build/trans_presets.java:3186
 msgid "railway"
 msgstr "spoorweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "waterway"
 msgstr "waterweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
 msgid "landuse"
 msgstr "grondgebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
 #: ../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:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #, java-format
 msgid "{0} node"
@@ -3652,5 +3710,5 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192
 #, java-format
 msgid "{0} member"
@@ -3659,33 +3717,33 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:126
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:177
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:193
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:209
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3693,9 +3751,9 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:242
 msgid "Unknown host"
 msgstr "Onbekende host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
 msgid "Object deleted"
 msgstr ""
@@ -3717,7 +3775,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
-#, fuzzy
 msgid "Click to close the dialog"
-msgstr "Opgeloste conflicten toepassen en dialoog sluiten"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3919,5 +3976,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:639
 msgid "Edit"
 msgstr "Bewerken"
@@ -4043,10 +4100,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330
 msgid "Layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4178,5 +4235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
@@ -4185,5 +4242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
@@ -4193,5 +4250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143
 msgid "Members"
 msgstr "Leden"
@@ -4620,5 +4677,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:197
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199
 msgid "No, abort"
 msgstr ""
@@ -4676,6 +4733,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
-#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
 msgstr "<ongedefinieerd>"
@@ -4804,4 +4859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "none"
@@ -4898,5 +4954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
 #, java-format
 msgid "{0} way"
@@ -4907,5 +4963,5 @@
 #: ../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:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
 #, java-format
 msgid "{0} relation"
@@ -4946,7 +5002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
-#, fuzzy
 msgid "Enter a role for all relation memberships"
-msgstr "Waarden voor alle conflicten invoeren."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5032,5 +5087,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5128,5 +5183,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:620
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:75
 msgid "Add"
@@ -5182,11 +5237,11 @@
 msgstr "De geschiedenis van alle geselecteerde items tonen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:234
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:244
 msgid "Object with history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -5194,13 +5249,13 @@
 msgstr "Herladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:262
 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:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301
 msgid "Show"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:302
 msgid "Display the history of the selected objects."
 msgstr ""
@@ -5257,7 +5312,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
-#, java-format
-msgid "This will change up to {0} object."
+#, fuzzy, java-format
+msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
 msgstr[0] "Dit verandert {0} object."
@@ -5265,5 +5319,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
-msgid "An empty value deletes the key."
+#, fuzzy
+msgid "An empty value deletes the tag."
 msgstr "Een lege waarde verwijdert de sleutel."
 
@@ -5288,4 +5343,11 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Dit verandert {0} object."
+msgstr[1] "Dit verandert {0} objecten."
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
@@ -5362,60 +5424,56 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194
 #: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
 msgid "Open a list of all relations."
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348
 msgid "Open an editor for the selected relation"
 msgstr "Een editor voor de geselecteerde relatie openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529
 msgid "Select the members of all selected relations"
-msgstr "De geselecteerde relatie verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531
 msgid "Select members"
-msgstr "Selecteer één van beide:"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558
 msgid "Download all members of the selected relations"
-msgstr "De geselecteerde relatie verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559
 msgid "Download members"
-msgstr "Leden downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5572,5 +5630,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5809,18 +5867,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190
 msgid "Zoom to"
 msgstr ""
 
-#: ../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 primitive the first selected member refers to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+msgid "Zoom to the object the first selected member refers to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5843,5 +5901,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5923,12 +5981,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
-#, fuzzy
 msgid "Create bookmark"
-msgstr "Kader aanmaken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
-#, fuzzy
 msgid "Add a bookmark for the currently selected download area"
-msgstr "De geselecteerde leden omlaag verplaatsen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
@@ -5939,7 +5995,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
-#, fuzzy
 msgid "Please enter a name for the bookmarked download area."
-msgstr "Voer een naam in voor de locatie."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
@@ -5949,12 +6004,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
-#, fuzzy
 msgid "Remove the currently selected bookmarks"
-msgstr "De geselecteerde leden omhoog verplaatsen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
-#, fuzzy
 msgid "Rename the currently selected bookmark"
-msgstr "De geselecteerde leden omhoog verplaatsen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
@@ -6014,7 +6067,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
-#, fuzzy
 msgid "Select to download OSM data in the selected download area."
-msgstr "Een weg bij de geselecteerde knoop splitsen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
@@ -6023,7 +6075,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
-#, fuzzy
 msgid "Select to download GPS traces in the selected download area."
-msgstr "De geselecteerde weg bevat niet de geselecteerde knoop."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
@@ -6047,7 +6098,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
-#, fuzzy
 msgid "No area selected yet"
-msgstr "Geen GPX-tracks geselecteerd"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
@@ -6062,17 +6112,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
-#, fuzzy
 msgid "Click to close the dialog and to abort downloading"
-msgstr "Sluit dialoog en stop het downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
-#, fuzzy
 msgid "Click do download the currently selected area"
-msgstr "De geselecteerde leden omhoog verplaatsen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
-#, fuzzy
 msgid "Please select a download area first."
-msgstr "Selecteer een rij om te bewerken."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
@@ -6088,7 +6135,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
-#, fuzzy
 msgid "Enter a place name to search for"
-msgstr "Voer een plaats in om naar te zoeken:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
@@ -6102,12 +6148,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
-#, fuzzy
 msgid "Search ..."
-msgstr "Zoeken..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
-#, fuzzy
 msgid "Click to start searching for places"
-msgstr "Richting om naar land te zoeken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
@@ -7037,7 +7081,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
-#, fuzzy
 msgid "Near"
-msgstr "nabij"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
@@ -7082,5 +7125,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189
 #, java-format
 msgid ""
@@ -7094,5 +7137,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211
 #, java-format
 msgid ""
@@ -7103,5 +7146,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313
 #, java-format
 msgid ""
@@ -7110,19 +7153,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318
 msgid "Failed to open URL"
 msgstr ""
 
 #. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351
 msgid "Open the current help page in an external browser"
 msgstr ""
 
 #. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363
 msgid "Edit the current help page"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370
 #, java-format
 msgid ""
@@ -7132,32 +7175,32 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
 msgid "Reload the current help page"
 msgstr ""
 
 #. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408
 msgid "Go to the previous page"
 msgstr ""
 
 #. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428
 msgid "Go to the next page"
 msgstr ""
 
 #. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444
 msgid "Go to the JOSM help home page"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475
 msgid "Warning: bad location in HTML document. Exception was: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525
 msgid "Failed to open help page. The target URL is empty."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526
 msgid "Failed to open help page"
 msgstr ""
@@ -7179,37 +7222,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137
 msgid "Coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
 #, java-format
 msgid "History for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
 #, java-format
 msgid "History for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
 #, java-format
 msgid "History for relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:125
 msgid "Close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
 msgid "Reload the history from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306
 #, java-format
 msgid ""
@@ -7217,5 +7260,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 #, java-format
 msgid ""
@@ -7223,9 +7266,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 #, java-format
 msgid ""
@@ -7234,24 +7277,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:52
 msgid "Load history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+msgstr "Parameter \"{0}\" mag niet leeg zijn."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83
+#, java-format
+msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128
 #, java-format
 msgid "Object id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:180
 #, java-format
 msgid "Loading history for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:181
 #, java-format
 msgid "Loading history for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:182
 #, java-format
 msgid "Loading history for relation {0}"
@@ -7264,4 +7317,22 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+#, fuzzy
+msgid "Zoom to node"
+msgstr "Op probleem inzoomen"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197
+msgid "Zoom to this node in the current data layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
+#, fuzzy
+msgid "Show history"
+msgstr "geschiedenis"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243
+msgid "Open a history browser with the history of this node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
 #, java-format
@@ -7274,17 +7345,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
+#, fuzzy
+msgid "not present"
+msgstr "Voorinstellingenmenu sorteren"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
+#. item "Ways/Cycleway" combo "Pedestrians"
+#. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:785
+#: build/trans_presets.java:800 build/trans_presets.java:1344
+#: build/trans_presets.java:1411 build/trans_presets.java:1412
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96
 #, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+#, fuzzy
+msgid "anonymous"
+msgstr "Anoniem"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7309,4 +7430,19 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106
+#, fuzzy, java-format
+msgid "Version {0} in editor"
+msgstr "Versie {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
+#, fuzzy
+msgid "[deleted]"
+msgstr "verwijderd"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
 msgstr ""
 
@@ -7651,9 +7787,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, fuzzy, java-format
+#, java-format
 msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] "Objecten om te bewerken:"
-msgstr[1] "Objecten om te bewerken:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7733,13 +7869,13 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:966
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969
 msgid "Load the list of your open changesets from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:980
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983
 msgid "Close the currently selected open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
@@ -7806,5 +7942,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147
 #, java-format
 msgid "Reading {0}..."
@@ -7816,5 +7952,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
@@ -7840,5 +7976,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 msgid "image"
 msgid_plural "images"
@@ -7893,43 +8029,43 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 msgid "gps point"
 msgstr "GPS-punt"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../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:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+#: ../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:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../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:129
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+#: ../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:143
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../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:160
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
 msgstr "Kleur aanpassen"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
@@ -7937,6 +8073,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -8026,10 +8162,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753
+#: ../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:762
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8039,43 +8175,43 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
+#: ../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:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925
 #, java-format
 msgid ""
@@ -8086,9 +8222,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
 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:1206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8098,5 +8234,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8155,37 +8291,36 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#, fuzzy
 msgid "Click to close this dialog and continue editing"
-msgstr "Sluit dialoog en stop het downloaden"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#, fuzzy, java-format
+msgstr ""
+
+#: ../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"
 msgid_plural "{0} deleted"
-msgstr[0] " ({0} verwijderd.)"
-msgstr[1] " ({0} verwijderd.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../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:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../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:628
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../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/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8193,5 +8328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
 msgctxt "gps"
 msgid "track"
@@ -8200,5 +8335,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
 msgid "point"
 msgid_plural "points"
@@ -8206,5 +8341,5 @@
 msgstr[1] "Punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 #, java-format
 msgid "a track with {0} point"
@@ -8213,5 +8348,5 @@
 msgstr[1] "Een track met {0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194
 #, java-format
 msgid "{0} consists of {1} track"
@@ -8220,5 +8355,5 @@
 msgstr[1] "{0} bestaat uit {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194
 #, java-format
 msgid "{0} point"
@@ -8227,9 +8362,9 @@
 msgstr[1] "{0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
 msgid "marker"
 msgid_plural "markers"
@@ -8237,5 +8372,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -8244,14 +8379,14 @@
 msgstr[1] "{0} bestaat uit {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:225
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
 msgid "Synchronize Audio"
 msgstr "Geluid synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pauzeer het geluid op het moment dat je de synchronisatiehulp hoort."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #, java-format
@@ -8259,14 +8394,14 @@
 msgstr "Geluid gesynchroniseerd op punt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan in de afgespeelde laag niet synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:258
 msgid "Make Audio Marker at Play Head"
 msgstr "Geluidsmarker op afspeelstart zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -8276,13 +8411,13 @@
 "marker wilt hebben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
 msgid "Show/Hide Text/Icons"
 msgstr "Tekst/pictogrammen tonen/verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
@@ -8350,5 +8485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660
 msgid "Please select the row to edit."
 msgstr "Selecteer een rij om te bewerken."
@@ -8362,5 +8497,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
 msgid "Please select the row to delete."
@@ -9105,12 +9240,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
-#, fuzzy
 msgid "Remove the selected styles from the list of active styles"
-msgstr "De geselecteerde bron uit de lijst verwijderen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
-#, fuzzy
 msgid "Edit the filename or URL for the selected active style"
-msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
@@ -9124,22 +9257,19 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
-#, fuzzy
 msgid "Add a new icon path"
-msgstr "Een nieuwe laag toevoegen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
-#, fuzzy
 msgid "Remove the selected icon paths"
-msgstr "De geselecteerde lijst herladen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
-#, fuzzy
 msgid "Edit the selected icon path"
-msgstr "De geselecteerde bron bewerken."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
-#, fuzzy, java-format
+#, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr "Data aan het uploaden voor laag ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
@@ -9776,5 +9906,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9801,5 +9931,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9807,5 +9937,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9818,5 +9948,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9968,5 +10098,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9975,38 +10105,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -10014,19 +10144,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member>-specificatie met ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with ID=0."
 msgstr "Ongeldig object met id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -10037,9 +10167,9 @@
 #. default version in 0.5 files for existing primitives
 #. default version in 0.5 files for new primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379
 #, java-format
 msgid ""
@@ -10049,25 +10179,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402
 #, 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:426
 #, java-format
 msgid ""
@@ -10075,5 +10205,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:445
 #, java-format
 msgid ""
@@ -10082,5 +10212,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:493
 #, java-format
 msgid ""
@@ -10088,5 +10218,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
 #, java-format
 msgid ""
@@ -10095,13 +10225,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:560
 msgid "Preparing data set..."
 msgstr ""
@@ -10252,9 +10382,9 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#, fuzzy, java-format
+#, java-format
 msgid "{0} Plugin successfully downloaded."
 msgid_plural "{0} Plugins successfully downloaded."
-msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
-msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
@@ -10316,7 +10446,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
-#, fuzzy
 msgid "Update plugins"
-msgstr "Plugins bijwerken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
@@ -10461,35 +10590,4 @@
 "\n"
 "{0}"
-
-#. item "Ways/Cycleway" combo "Pedestrians"
-#. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:335 build/trans_presets.java:336
-#: build/trans_presets.java:337 build/trans_presets.java:338
-#: build/trans_presets.java:339 build/trans_presets.java:340
-#: build/trans_presets.java:341 build/trans_presets.java:342
-#: build/trans_presets.java:343 build/trans_presets.java:344
-#: build/trans_presets.java:345 build/trans_presets.java:461
-#: build/trans_presets.java:481 build/trans_presets.java:541
-#: build/trans_presets.java:542 build/trans_presets.java:543
-#: build/trans_presets.java:562 build/trans_presets.java:563
-#: build/trans_presets.java:564 build/trans_presets.java:583
-#: build/trans_presets.java:584 build/trans_presets.java:585
-#: build/trans_presets.java:604 build/trans_presets.java:605
-#: build/trans_presets.java:606 build/trans_presets.java:625
-#: build/trans_presets.java:626 build/trans_presets.java:627
-#: build/trans_presets.java:646 build/trans_presets.java:647
-#: build/trans_presets.java:648 build/trans_presets.java:785
-#: build/trans_presets.java:800 build/trans_presets.java:1344
-#: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2483
-#: build/trans_presets.java:2484 build/trans_presets.java:2485
-msgid "unknown"
-msgstr "onbekend"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
@@ -11113,47 +11211,46 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../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:120
+#: ../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:125
-#, fuzzy
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:126
 msgid "One of the selected files was null"
-msgstr "Een van de geselecteerde bestanden was leeg!!!"
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
+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:185
+#: ../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:197
+#: ../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:203
+#: ../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:206
+#: ../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:295
+#: ../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:314
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:315
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11169,24 +11266,24 @@
 msgstr "Verzameling afbeeldingen laden als een nieuwe laag."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130
+#: ../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:151
+#: ../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:175
+#: ../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:184
+#: ../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:223
+#: ../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."
@@ -11198,34 +11295,34 @@
 "een tijdzone<hr></html>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241
+#: ../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:256
+#: ../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:268
+#: ../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:276
+#: ../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:339
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375
+#: ../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:348
+#: ../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:389
+#: ../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:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404
 msgid ""
 "Error while parsing the date.\n"
@@ -11235,70 +11332,70 @@
 "Gebruik de verwachte indeling a.u.b."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405
+#: ../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:448
+#: ../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:454
+#: ../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:459
+#: ../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:475
+#: ../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:497
+#: ../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:509
+#: ../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:526
+#: ../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:535
+#: ../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:545
+#: ../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:555
+#: ../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:576
+#: ../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:577
+#: ../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:577
+#: ../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:591
+#: ../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:592
+#: ../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:604
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
 #, java-format
 msgid ""
@@ -11309,9 +11406,9 @@
 "Verwachte indeling: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:605
+#: ../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:617
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
 #, java-format
 msgid ""
@@ -11322,26 +11419,26 @@
 "Verwachte indeling: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:618
+#: ../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:661
+#: ../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:662
+#: ../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:697
+#: ../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:698
+#: ../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:732
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
@@ -11349,39 +11446,39 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:733
+#: ../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:778
+#: ../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:779
+#: ../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:780
+#: ../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:797
+#: ../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:800
+#: ../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:807
+#: ../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:869
+#: ../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 "
@@ -11389,13 +11486,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
+#: ../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:887
+#: ../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:888
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886
 msgid "Default Values"
 msgstr "Standaardwaarden"
@@ -11416,5 +11513,5 @@
 msgstr "Bestand {0} gaat fout"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
 #, java-format
 msgid ""
@@ -11427,37 +11524,37 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
 msgid "Lambert Zone 1 cache file (.1)"
 msgstr "Bufferbestand Lambert-zone 1 (.1)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
 msgid "Lambert Zone 2 cache file (.2)"
 msgstr "Bufferbestand Lambert-zone 2 (.2)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
 msgid "Lambert Zone 3 cache file (.3)"
 msgstr "Bufferbestand Lambert-zone 3 (.3)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20
 msgid "Lambert Zone 4 cache file (.4)"
 msgstr "Bufferbestand Lambert-zone 4 (.4)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:41
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166
 msgid "CadastreGrabber: Illegal url."
 msgstr "CadastreGrabber: ongeldige URL."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:78
 #, java-format
 msgid ""
@@ -11469,18 +11566,18 @@
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:365
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366
 msgid "Select commune"
 msgstr "Gemeente selecteren"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
 msgid "Choose from..."
 msgstr "Kies uit..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137
 msgid "Cadastre"
 msgstr "Kadaster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146
 msgid "Auto sourcing"
 msgstr "Automatisch vullen"
@@ -11507,34 +11604,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29
+#: ../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."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Grijstinten omkeren (voor zwarte achtergronden)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Set background transparent."
 msgstr "Achtergrond transparant maken."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:36
 msgid "Draw boundaries of downloaded data."
 msgstr "Grenzen van gedownloade gegevens tekenen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
 msgid "Enable automatic caching."
 msgstr "Automatisch bufferen inschakelen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "Max. cache size (in MB)"
 msgstr "Max. buffergrootte (in MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -11546,9 +11643,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "French cadastre WMS"
 msgstr "Franse kadaster WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
@@ -11556,10 +11653,10 @@
 "ingeschakeld</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
 msgid "Source"
 msgstr "Bron"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -11569,5 +11666,5 @@
 "in de JOSM-voorkeuren is opgegeven."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -11577,9 +11674,9 @@
 "tekst op donkere achtergronden."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
 msgid "Allows multiple layers stacking"
 msgstr "Stapelen van meerdere lagen toestaan"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -11587,37 +11684,37 @@
 "doorzichtig."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:123
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:142
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:146
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
 msgid "Fixed size square (default is 100m)"
 msgstr "Vaste vierkant groote (standaard is 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:166
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Vaste groote (van 25 tot 1000 meter)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:175
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -11625,31 +11722,31 @@
 "overschreden."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
 msgid "Auto-tag source added:"
 msgstr "Bron auto-tag toegevoegd:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
 msgid "Add \"source=...\" to elements?"
 msgstr "Voeg \"source=...\" toe aan elementen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:23
 #, java-format
 msgid "Downloading {0}"
 msgstr "{0} downloaden"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:58
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:31
 msgid "Contacting WMS Server..."
 msgstr "Met WMS-server verbinden..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:160
 msgid "Create buildings"
 msgstr "Gebouwen aanmaken"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265
 msgid ""
 "To avoid cadastre WMS overload,\n"
@@ -11659,30 +11756,30 @@
 "is importeergrootte beperkt tot maximaal 1 km2."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216
 msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr "Schakel auto-sourcing in en controleer cadastre millesime."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:64
 msgid "Extract SVG ViewBox..."
 msgstr "SVG ViewBox uitnemen..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:68
 msgid "Extract best fitting boundary..."
 msgstr "Best passende grens uitnemen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:129
 msgid "Create boundary"
 msgstr "Kader aanmaken"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
 msgid ""
 "Municipality vectorized !\n"
@@ -11690,29 +11787,29 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
 msgstr "Gemeentegrens uitnemen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29
 msgid "Only on vectorized layers"
 msgstr "Alleen op gevectoriseerde lagen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:21
 msgid "Extract building footprints"
 msgstr "Grondafdruk gebouw uitnemen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 msgid "Download Image from French Cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:27
 #, java-format
 msgid "Cadastre: {0}"
 msgstr "Cadastre: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:40
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:86
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -11721,13 +11818,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:48
 msgid "Grab non-georeferenced image"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:69
 msgid "Georeferencing interrupted"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:100
 msgid ""
 "This image contains georeference data.\n"
@@ -11735,5 +11832,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
 msgid ""
 "Click first corner for image cropping\n"
@@ -11741,14 +11838,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:170
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:171
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:190
+msgid "Image cropping"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:189
-msgid "Image cropping"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:188
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:208
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -11756,14 +11853,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:229
+msgid "Image georeferencing"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:228
-msgid "Image georeferencing"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:227
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:246
 msgid ""
 "Do you want to cancel completely\n"
@@ -11771,64 +11868,64 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:261
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:263
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
 msgid "East"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 msgid "North"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:278
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
 #, java-format
 msgid "Set {0} Lambert coordinates"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
 msgid "Set manually the Lambert zone"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44
 msgid "Zone"
 msgstr "Zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55
 msgid "Lambert zone"
 msgstr "Lambert-zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:22
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23
 msgid "Load location from cache (only if cache is enabled)"
 msgstr "Locatie uit buffer laden (alleen als buffer ingeschakeld is)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40
 #, java-format
 msgid "{0} not allowed with the current projection"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Change location"
 msgstr "Locatie veranderen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
 msgid "Set a new location for the next request"
 msgstr "Een nieuwe locatie voor het volgende verzoek instellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
 msgid "Add a new layer"
 msgstr "Een nieuwe laag toevoegen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
 #: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Locatie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11838,25 +11935,25 @@
 "die bekend is bij www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65
 msgid "Add new layer"
 msgstr "Voegt nieuwe laag toe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Reset cookie"
 msgstr "Cookie herstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Get a new cookie (session timeout)"
 msgstr "Een nieuwe cookie ontvangen (sessie verlopen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
 msgid "Export as PNG format (only raster images)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:63
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137
 #, java-format
@@ -11866,14 +11963,14 @@
 msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
 msgid "Adjust WMS"
 msgstr "WMS aanpassen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
 msgid "Adjust the position of the WMS layer (raster images only)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:62
 msgid ""
 "This mode works only if active layer is\n"
@@ -11881,5 +11978,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:20
 #: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
 #, java-format
@@ -11887,5 +11984,5 @@
 msgstr "WMS-tegel downloaden van {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:44
 msgid ""
 "More than one WMS layer present\n"
@@ -11895,34 +11992,34 @@
 "Selecteer er eerst één en probeer dan opnieuw"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Lege laag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-laag ({0}), {1} tegel(s) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is not vectorized."
 msgstr "Is niet gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
 #, java-format
 msgid "Raster size: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
 msgid "Is vectorized."
 msgstr "Is gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Omvattende reschthoek gemeente: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 #, java-format
 msgid ""
@@ -11933,18 +12030,18 @@
 "Maak een nieuwe aan."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394
 msgid "Cache Format Error"
 msgstr "Fout in bufferstructuur"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418
 msgid "Cache Lambert Zone Error"
 msgstr "Fout in buffer Lambert-zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551
 #, java-format
 msgid ""
@@ -12051,9 +12148,9 @@
 msgstr "Weg dupliceren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -12070,11 +12167,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:258
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:302
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Pad van GPX-laag importeren"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:292
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Bestaand pad laten vallen"
@@ -12084,5 +12181,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:328
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Geen GPX-gegevenslaag gevonden."
@@ -12295,5 +12392,5 @@
 msgstr "Niet-geotagged foto's tonen"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
 msgid "Imported Images"
 msgstr "Afbeeldingen importeren"
@@ -12726,5 +12823,5 @@
 msgstr "Hoek tussen twee geselecteerde knopen"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:60
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Laag om in te meten"
@@ -12803,5 +12900,5 @@
 msgstr "Downloadlus van OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:108
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:109
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-onderwerpen tonen"
@@ -12942,7 +13039,6 @@
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
-#, fuzzy
 msgid "PicLayer"
-msgstr "laag"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
@@ -13110,43 +13206,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137
 msgid "Slippy Map"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
-#, fuzzy
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148
 msgid "Auto Zoom"
-msgstr "Auto-zoom: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
-#, fuzzy
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
 msgid "Show Tile Info"
-msgstr "Tegelstatus tonen"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663
 msgid "image "
 msgstr ""
@@ -13182,7 +13276,6 @@
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
-#, fuzzy
 msgid "Min zoom lvl: "
-msgstr "Max. zoom |v|: "
+msgstr ""
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
@@ -13539,6 +13632,6 @@
 msgstr "Weet je het zeker?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:93
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
@@ -13546,5 +13639,5 @@
 msgstr "Validatiefouten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
 msgid "No validation errors"
 msgstr "Geen validatiefouten"
@@ -13635,5 +13728,5 @@
 msgstr "Validatie andere"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:109
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:108
 #, java-format
 msgid "Running test {0}"
@@ -13733,7 +13826,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
-#, fuzzy
 msgid "Unconnceted coastline"
-msgstr "Ongeordende kustlijn"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
@@ -13763,19 +13855,19 @@
 msgstr "Kruisende wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
 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:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
 msgid "Confirmation"
 msgstr ""
@@ -13936,81 +14028,81 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:451
 msgid "Painting problem"
 msgstr "Tekenprobleem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Toets ''{0}'' is ongeldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:466
 msgid "Tags with empty values"
 msgstr "Tags met lege waarden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Invalid property key"
 msgstr "Ongeldige eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid white space in property key"
 msgstr "Ongeldige spatie in eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Property values start or end with white space"
 msgstr "Eigenschapwaarde begin of eindigt met een spatie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values contain HTML entity"
 msgstr "Eigenschapwaarden bevatten HTML-codes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:517
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:518
 msgid "Presets do not contain property key"
 msgstr "Voorkeuzen bevatten geen eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:540
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:541
 msgid "Presets do not contain property value"
 msgstr "Voorkeuzen bevatten geen eigenschapswaarde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
 msgid "FIXMES"
 msgstr "Herstel-mij's"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:599
 msgid "Check property keys."
 msgstr "Eigenschapsleutels controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Valideer eigenschapsleutels met een woordenlijst"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Use complex property checker."
 msgstr "Uitgebreide eigenschapchecker gebruiken"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:608
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:626
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:648
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:629
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:630
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:669
 msgid "TagChecker source"
 msgstr "Tagcheckerbron"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../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."
@@ -14021,86 +14113,86 @@
 "tagchecker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Add a new source to the list."
 msgstr "Nieuwe bron aan lijst toevoegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:694
 msgid "Edit the selected source."
 msgstr "De geselecteerde bron bewerken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:695
 msgid "Delete the selected source from the list."
 msgstr "De geselecteerde bron uit de lijst verwijderen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "Data sources"
 msgstr "Gegevensbronnen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:717
 msgid "Check property values."
 msgstr "Eigenschapwaarden controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:718
 msgid "Validate that property values are valid checking against presets."
 msgstr "Valideer eigenschapwaarden tegen presets"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Check for FIXMES."
 msgstr "Controleer op herstel-mij's."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Check for paint notes."
 msgstr "Controleer op tekenknopen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
 msgid "Check if map painting found data errors."
 msgstr "Controleer of kaarttekenen fouten heeft gevonden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use default data file."
 msgstr "Standaardgegevensbestand gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
 msgid "Use the default data file (recommended)."
 msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use default spellcheck file."
 msgstr "Standaardbestand spellingscontrole gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:840
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:844
 msgid "Fix properties"
 msgstr "Eigenschappen herstellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:961
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:965
 msgid "Could not find element type"
 msgstr "Kan elementsoort niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:978
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:982
 msgid "Could not find warning level"
 msgstr "Kan waarschuwingsniveau niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:987
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ongeldige expressie ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:991
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -14277,17 +14369,17 @@
 "heeft."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
 msgid "Way end node near other highway"
 msgstr "Wegeindknoop dicht bij andere snelweg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:145
 msgid "Way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:166
 msgid "Way node near other way"
 msgstr "Wegknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:184
 msgid "Connected way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg verbonden"
@@ -14340,13 +14432,13 @@
 msgstr "De test controleer de richting van water-, land of kustlijnwegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:69
 msgid "Reversed coastline: land not on left side"
 msgstr "Omgekeerde kustlijn: land niet aan linker zijde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:74
 msgid "Reversed water: land not on left side"
 msgstr "Omgekeerd water: land niet aan linker zijde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:79
 msgid "Reversed land: land not on left side"
 msgstr "Omgekeerde land: land niet aan linker zijde"
@@ -14382,7 +14474,7 @@
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
-#, fuzzy, java-format
+#, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
-msgstr "WMS-laag ({0}), in zoom {1} downloaden"
+msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
@@ -14390,18 +14482,62 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
-msgid "Select a starting node on the end of a way"
-msgstr ""
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
-msgid "Reached the end of the line"
-msgstr ""
-
-#. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
-msgid "Reached a junction"
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
+#, fuzzy
+msgid "Way Download"
+msgstr "Downloaden"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57
+#, fuzzy
+msgid "Download map data on the end of selected way"
+msgstr "Kaart downloaden van de OSM-server."
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99
+msgid ""
+"<html>Neither a node nor a way with an endpoint outside of the<br>current "
+"download areas is selected.<br>Select a node on the start or end of a way or "
+"an entire way first.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:106
+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
+#, fuzzy, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+"<html>Er zijn onopgeloste conflicten in laag ''{0}''.<br>U dient deze eerst "
+"op te lossen</html>"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168
+#, java-format
+msgid ""
+"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
+"discovered after download"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:182
+#, java-format
+msgid ""
+"<html>There aren''t further connected ways to download.<br>A potential "
+"duplicate node of the currently selected node was found, though.<br><br>The "
+"currently selected node is ''{0}''<br>The potential duplicate node is "
+"''{1}''<br>Merge the duplicate node onto the currently selected node and "
+"continue way downloading?</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195
+#, fuzzy
+msgid "Merge duplicate node?"
+msgstr "Dubbele knopen verwijderen..."
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212
+msgid "<html>No more connected ways to download.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:221
+#, java-format
+msgid "Node ''{0}'' is a junction with more than 2 connected ways."
 msgstr ""
 
@@ -14409,43 +14545,4 @@
 msgid "Exception occurred"
 msgstr "Uitzondering opgetreden"
-
-#. super("Help / About");
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "help"
-msgstr "hulp"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
-msgid "Help / About"
-msgstr "Hulp / Over"
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
-msgid ""
-"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 "
-"following schema:\n"
-"wmsplugin.url.1.name=Landsat\n"
-"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
-"wmsplugin.url.2.name=NPE Maps... etc\n"
-"\n"
-"Full WMS URL input format example (landsat)\n"
-"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
-"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
-"\n"
-"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"
-"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"
-"Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
-"use."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
-msgid "WMS Plugin Help"
-msgstr "WMS-pluginhulp"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
@@ -14550,28 +14647,28 @@
 "Dat kan tot foutieve coördinaten leiden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
 msgstr "Automatisch downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190
 #, java-format
 msgid ""
@@ -14582,13 +14679,13 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -14596,42 +14693,42 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:301
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
 #, 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:401
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
@@ -19058,14 +19155,12 @@
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
-#, fuzzy
 msgid "Palaeontological Site"
-msgstr "Archeologische plaats"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
 #: build/trans_presets.java:1843
-#, fuzzy
 msgid "Edit Palaeontological Site"
-msgstr "Archeologische plaats bewerken"
+msgstr ""
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -27034,42 +27129,76 @@
 msgstr ""
 
+#~ msgid "Can't search because there is no loaded data."
+#~ msgstr "Kan niet zoeken omdat er geen data geladen is"
+
+#~ msgid "help"
+#~ msgstr "hulp"
+
+#~ msgid "Help / About"
+#~ msgstr "Hulp / Over"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "WMS-pluginhulp"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecteer eerst een bladwijzer."
+
+#~ msgid "Unknown version"
+#~ msgstr "Onbekende versie"
+
+#~ msgid "position"
+#~ msgstr "positie"
+
+#~ msgid "different"
+#~ msgstr "verschillend"
+
+#~ msgid "true"
+#~ msgstr "Waar"
+
+#~ msgid "Move"
+#~ msgstr "Verplaatsen"
+
 #~ msgid "File could not be found."
 #~ msgstr "Bestand kon niet gevonden worden."
 
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Selecteer tenminste één taak om te downloaden"
-
-#~ msgid "Upload to OSM API failed"
-#~ msgstr "Upload naar OSM API gefaald"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Conflicterende relatie"
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Conflicten oplossen"
 
 #~ msgid "Error while parsing"
 #~ msgstr "Probleem tijdens lezen"
 
-#~ msgid "File not found"
-#~ msgstr "Bestand niet gevonden"
-
-#~ msgid "Please enter the desired coordinates first."
-#~ msgstr "Voer eerst de gewenste coördinaten in."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecteer eerst een bladwijzer."
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Voer een zoekstring in"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan locatiezoekresultaten van server niet lezen"
-
-#~ msgid "name"
-#~ msgstr "naam"
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "De rij om te kopiëren selecteren."
+#~ msgid "unnamed"
+#~ msgstr "Onbenoemd"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Alle wegen zijn leeg"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Openen in browser"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het "
+#~ "later nog eens."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-element in niet-weg gevonden."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> heeft geen referenties"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Misvormde knoop-id"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-element in niet-relatie gevonden."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Plugin vereist JOSM-update: {0}"
 
 #~ msgid ""
@@ -27081,68 +27210,4 @@
 #~ "warntime'.)"
 
-#~ msgid "Request Update"
-#~ msgstr "Update aanvragen"
-
-#~ msgid "error loading metadata"
-#~ msgstr "laden van metadata is mislukt"
-
-#~ msgid "requested: {0}"
-#~ msgstr "verzocht: {0}"
-
-#~ msgid "error requesting update"
-#~ msgstr "update aanvragen is mislukt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Onbekende versie"
-
-#~ msgid "position"
-#~ msgstr "positie"
-
-#~ msgid "different"
-#~ msgstr "verschillend"
-
-#~ msgid "true"
-#~ msgstr "Waar"
-
-#~ msgid "Move"
-#~ msgstr "Verplaatsen"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Conflicten oplossen"
-
-#~ msgid "unnamed"
-#~ msgstr "Onbenoemd"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle wegen zijn leeg"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Openen in browser"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server antwoordde met interne fout. Verklein het gebied of probeer het "
-#~ "later nog eens."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-element in niet-weg gevonden."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> heeft geen referenties"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Misvormde knoop-id"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-element in niet-relatie gevonden."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin vereist JOSM-update: {0}"
-
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
@@ -27152,4 +27217,7 @@
 #~ 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..."
@@ -27193,4 +27261,7 @@
 #~ "geselecteerd in de geschiedenislijst."
 
+#~ msgid "name"
+#~ msgstr "naam"
+
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
@@ -27205,6 +27276,12 @@
 #~ msgstr "Kan plugin niet downloaden: {0} van {1}"
 
+#~ msgid "File not found"
+#~ msgstr "Bestand niet gevonden"
+
 #~ msgid "Delete {1} {0}"
 #~ msgstr "{1} {0} verwijderen"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Conflicterende relatie"
 
 #~ msgid "EPSG:4326"
@@ -27279,6 +27356,15 @@
 #~ msgstr "Samenvoegconflicten."
 
+#~ msgid "error loading metadata"
+#~ msgstr "laden van metadata is mislukt"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "TCX-bestand importeren..."
+
+#~ msgid "Request Update"
+#~ msgstr "Update aanvragen"
+
+#~ msgid "error requesting update"
+#~ msgstr "update aanvragen is mislukt"
 
 #~ msgid "Import TCX file as GPS track"
@@ -27364,4 +27450,13 @@
 #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
 
+#~ msgid "Please enter a search string"
+#~ msgstr "Voer een zoekstring in"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan locatiezoekresultaten van server niet lezen"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
 #~ msgid "Validate"
 #~ msgstr "Valideren"
@@ -27462,4 +27557,7 @@
 #~ msgstr "Wegen combineren ondanks verschillende relaties?"
 
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Selecteer tenminste één taak om te downloaden"
+
 #~ msgid "No document open so nothing to save."
 #~ msgstr "Geen document geopend, dus ook niets om op te slaan."
@@ -27511,4 +27609,10 @@
 #~ msgid "resolved version:"
 #~ msgstr "samengevoegde versie:"
+
+#~ msgid "requested: {0}"
+#~ msgstr "verzocht: {0}"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "De rij om te kopiëren selecteren."
 
 #~ msgid "YAHOO (GNOME)"
@@ -27699,2 +27803,5 @@
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upload naar OSM API gefaald"
